Expected over references

.beman-tidy.yaml

@@ -4,5 +4,7 @@
 # Check documentation for beman-tidy here:
 # https://github.com/bemanproject/beman-tidy/blob/main/README.md
 
-disabled_rules: []
-ignored_paths: []
+disabled_rules:
+    # None
+ignored_paths:
+    # None

.copier-answers.yml

@@ -1,5 +1,6 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # Standard answers and internal state managed by Copier
-_commit: 2.0.0-322-gc3c230c
+_commit: v2.4.1-14-g66b1f43
 _src_path: https://github.com/steve-downey/exemplar.git
 description: Expected Over References
 maintainer: steve-downey

.gitattributes

@@ -1,6 +1,4 @@
 infra/** linguist-vendored
-template/** linguist-vendored
-copier/** linguist-vendored
 *.bib -linguist-detectable
 *.tex -linguist-detectable
 papers/* linguist-documentation

.github/CODEOWNERS

@@ -1,23 +1,3 @@
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
-# Codeowners for reviews on PRs
 
-# Note(river):
-# **Please understand how codeowner file work before uncommenting anything in this section:**
-# https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
-#
-# For projects using expected as a template and intend to reuse its infrastructure,
-# River (@wusatosi) helped create most of the original infrastructure under the scope described below,
-# they are more than happy to help out with any PRs downstream,
-# as well as to sync any useful change upstream to expected.
-#
-# Github Actions:
-# .github/workflows/ @wusatosi # Add other project owners here
-#
-# Devcontainer:
-# .devcontainer/ @wusatosi # Add other project owners here
-#
-# Pre-commit:
-# .pre-commit-config.yaml @wusatosi # Add other project owners here
-# .markdownlint.yaml @wusatosi # Add other project owners here
-
-*  @ednolan @bretbrownjr @dietmarkuehl @steve-downey @wusatosi
+*  @steve-downey

.github/workflows/pre-commit-check.yml

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 name: Lint Check (pre-commit)
 
 on:
@@ -8,8 +9,12 @@ on:
     branches:
       - main
 
+permissions:
+  contents: read
+  checks: write
+  issues: write
+  pull-requests: write
+
 jobs:
   pre-commit:
-    permissions:
-      contents: read
     uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-pre-commit.yml@1.7.3

.github/workflows/vcpkg-release.yml

@@ -6,7 +6,6 @@ on:
     types: [published]
 jobs:
   vcpkg-release:
-    permissions: {}
     uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.3
     with:
       port_name: beman-expected

.pre-commit-config.yaml

@@ -5,48 +5,45 @@ repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:
-      - id: trailing-whitespace
-      - id: end-of-file-fixer
-      - id: check-yaml
-      - id: check-added-large-files
+    -   id: trailing-whitespace
+    -   id: end-of-file-fixer
+    -   id: check-yaml
+    -   id: check-added-large-files
 
-  # Clang-format for C++
-  # This brings in a portable version of clang-format.
-  # See also: https://github.com/ssciwr/clang-format-wheel
+    # Clang-format for C++
+    # This brings in a portable version of clang-format.
+    # See also: https://github.com/ssciwr/clang-format-wheel
   - repo: https://github.com/pre-commit/mirrors-clang-format
     rev: v22.1.5
     hooks:
-      - id: clang-format
-        types_or: [c++, c]
+    - id: clang-format
+      types_or: [c++, c]
 
-  # CMake linting and formatting
+    # CMake linting and formatting
   - repo: https://github.com/BlankSpruce/gersemi-pre-commit
-    rev: 0.27.7
+    rev: 0.27.6
     hooks:
-      - id: gersemi
-        name: CMake linting
-        exclude: ^.*/tests/.*/data/  # Exclude test data directories
+    - id: gersemi
+      name: CMake linting
+      exclude: ^.*/tests/.*/data/ # Exclude test data directories
 
-  # Markdown linting
-  # Config file: .markdownlint.yaml
-  # Commented out to disable this by default.
-  # Uncomment to enable markdown linting.
+    # Markdown linting
+    # Config file: .markdownlint.yaml
+    # Commented out to disable this by default. Uncomment to enable markdown linting.
   # - repo: https://github.com/igorshubovych/markdownlint-cli
   #   rev: v0.42.0
   #   hooks:
-  #     - id: markdownlint
+  #   - id: markdownlint
 
   - repo: https://github.com/codespell-project/codespell
     rev: v2.4.2
     hooks:
       - id: codespell
-        additional_dependencies:
-          - tomli
 
-  #   # Beman Standard checking via beman-tidy
-  # - repo: https://github.com/bemanproject/beman-tidy
-  #   rev: v0.3.1
-  #   hooks:
-  #   - id: beman-tidy
+    # Beman Standard checking via beman-tidy
+  - repo: https://github.com/bemanproject/beman-tidy
+    rev: v0.5.1
+    hooks:
+    - id: beman-tidy
 
-exclude: 'template/|copier/|infra/|port/'
+exclude: 'infra/|port/'

CMakeLists.txt

@@ -1,4 +1,3 @@
-# CMakeLists.txt                                                    -*-cmake-*-
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
 cmake_minimum_required(VERSION 3.30...4.3)
@@ -81,17 +80,6 @@ add_subdirectory(include/beman/expected)
 beman_install_library(beman.expected TARGETS beman.expected)
 configure_build_telemetry()
 
-if(BEMAN_EXPECTED_BUILD_TESTS)
-    find_package(Catch2 CONFIG REQUIRED)
-    # When Catch2 is fetched via FetchContent, its extras dir needs to be on the module path.
-    # FetchContent_GetProperties reads global state set during fetch, so works from any scope.
-    include(FetchContent)
-    FetchContent_GetProperties(catch2)
-    if(catch2_POPULATED AND catch2_SOURCE_DIR)
-        list(APPEND CMAKE_MODULE_PATH ${catch2_SOURCE_DIR}/extras)
-    endif()
-endif()
-
 if(BEMAN_EXPECTED_BUILD_TESTS)
     enable_testing()
     add_subdirectory(tests/beman/expected)
@@ -100,3 +88,14 @@ endif()
 if(BEMAN_EXPECTED_BUILD_EXAMPLES)
     add_subdirectory(examples)
 endif()
+
+# Coverage
+configure_file("cmake/gcovr.cfg.in" gcovr.cfg @ONLY)
+
+add_custom_target(
+    process_coverage
+    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+    COMMENT "Running gcovr to process coverage results"
+    COMMAND mkdir -p coverage
+    COMMAND gcovr --config gcovr.cfg .
+)

CMakePresets.json

@@ -8,8 +8,10 @@
       "binaryDir": "${sourceDir}/build/${presetName}",
       "cacheVariables": {
         "CMAKE_CXX_STANDARD": "20",
-        "CMAKE_EXPORT_COMPILE_COMMANDS": "ON",
-        "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "./infra/cmake/use-fetch-content.cmake"
+        "CMAKE_CXX_EXTENSIONS": false,
+        "CMAKE_CXX_STANDARD_REQUIRED": true,
+        "CMAKE_EXPORT_COMPILE_COMMANDS": true,
+        "CMAKE_PROJECT_TOP_LEVEL_INCLUDES": "${sourceDir}/infra/cmake/use-fetch-content.cmake"
       }
     },
     {
@@ -35,7 +37,7 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/gnu-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/gnu-toolchain.cmake"
       }
     },
     {
@@ -46,7 +48,7 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/gnu-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/gnu-toolchain.cmake"
       }
     },
     {
@@ -57,7 +59,12 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/llvm-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {
@@ -68,7 +75,12 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/llvm-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/llvm-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Linux"
       }
     },
     {
@@ -79,7 +91,12 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/appleclang-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
       }
     },
     {
@@ -90,7 +107,12 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/appleclang-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/appleclang-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Darwin"
       }
     },
     {
@@ -101,8 +123,12 @@
         "_debug-base"
       ],
       "cacheVariables": {
-        "CMAKE_CXX_STANDARD": "23",
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/msvc-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/msvc-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     },
     {
@@ -113,16 +139,24 @@
         "_release-base"
       ],
       "cacheVariables": {
-        "CMAKE_CXX_STANDARD": "23",
-        "CMAKE_TOOLCHAIN_FILE": "infra/cmake/msvc-toolchain.cmake"
+        "CMAKE_TOOLCHAIN_FILE": "${sourceDir}/infra/cmake/msvc-toolchain.cmake"
+      },
+      "condition": {
+        "type": "equals",
+        "lhs": "${hostSystemName}",
+        "rhs": "Windows"
       }
     }
   ],
   "buildPresets": [
     {
       "name": "_root-build",
       "hidden": true,
-      "jobs": 0
+      "jobs": 0,
+      "targets": [
+        "all_verify_interface_header_sets",
+        "all"
+      ]
     },
     {
       "name": "gcc-debug",

CONTRIBUTING.md

@@ -106,7 +106,6 @@ ctest --test-dir build
 The file `./lockfile.json` configures the list of dependencies and versions that will be
 acquired by FetchContent.
 
-
 ## Project-specific configure arguments
 
 Project-specific options are prefixed with `BEMAN_EXPECTED`.