Merge baseline Expected

.beman-tidy.yaml

@@ -0,0 +1,8 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+# This is the config file for beman-tidy, which checks compliance with the Beman Standard (https://github.com/bemanproject/beman/blob/main/docs/beman_standard.md)
+# Check documentation for beman-tidy here:
+# https://github.com/bemanproject/beman-tidy/blob/main/README.md
+
+disabled_rules: []
+ignored_paths: []

.clang-format

@@ -125,7 +125,7 @@ IndentCaseBlocks: false
 IndentCaseLabels: false
 IndentExternBlock: AfterExternBlock
 IndentGotoLabels: true
-IndentPPDirectives: None
+IndentPPDirectives: BeforeHash
 IndentRequiresClause: true
 IndentWidth:     4
 IndentWrappedFunctionNames: false

.copier-answers.yml

@@ -0,0 +1,14 @@
+# Standard answers and internal state managed by Copier
+_commit: 2.0.0-322-gc3c230c
+_src_path: https://github.com/steve-downey/exemplar.git
+description: Expected Over References
+maintainer: steve-downey
+minimum_cpp_build_version: '20'
+paper: PnnnnRr
+project_name: expected
+unit_test_library: catch2
+# Hidden variables manually tracked because 'when: false' omits them from _copier_answers
+generating_exemplar: false
+owner: "bemanproject"
+ci_tests_cron: "15 12 * * 2"
+pre_commit_update_cron: "50 7 * * 4"

.exemplar_version

@@ -0,0 +1 @@
+ec861600898941a5114f352f1efcba57d825b6d0

.gitattributes

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

.github/workflows/ci_tests.yml

@@ -9,7 +9,11 @@
   pull_request:
   workflow_dispatch:
   schedule:
-    - cron: '30 15 * * *'
+    - cron: '15 12 * * 2'
+
+concurrency:
+  group: ${{format('{0}:{1}', github.repository, github.ref)}}
+  cancel-in-progress: true
 
 jobs:
   beman-submodule-check:
@@ -36,35 +40,60 @@
       matrix_config: >
         {
           "gcc": [
-            { "versions": ["15"],
+            { "versions": ["16"],
               "tests": [
                 { "cxxversions": ["c++26"],
                   "tests": [
                     { "stdlibs": ["libstdc++"],
                       "tests": [
                         "Debug.Default", "Release.Default", "Release.TSan",
                         "Release.MaxSan", "Debug.Werror",
-                        "Debug.Coverage"
+                        "Debug.Coverage", "Debug.-DBEMAN_EXPECTED_USE_MODULES=On"
+                      ]
+                    }
+                  ]
+                },
+                { "cxxversions": ["c++23"],
+                  "tests": [
+                    { "stdlibs": ["libstdc++"],
+                      "tests": [
+                        "Release.Default", "Debug.-DBEMAN_EXPECTED_USE_MODULES=On"
+                      ]
+                    }
+                  ]
+                },
+                { "cxxversions": ["c++20"],
+                  "tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
+                }
+              ]
+            },
+            { "versions": ["15"],
+              "tests": [
+                { "cxxversions": ["c++26", "c++23"],
+                  "tests": [
+                    { "stdlibs": ["libstdc++"],
+                      "tests": [
+                        "Release.Default", "Debug.-DBEMAN_EXPECTED_USE_MODULES=On"
                       ]
                     }
                   ]
                 },
-                { "cxxversions": ["c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++20"],
                   "tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
                 }
               ]
             },
             { "versions": ["14", "13"],
               "tests": [
-                { "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++26", "c++23", "c++20"],
                   "tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
                 }
               ]
             },
             {
               "versions": ["12", "11"],
               "tests": [
-                { "cxxversions": ["c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++23", "c++20"],
                   "tests": [{ "stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
                 }
               ]
@@ -78,12 +107,22 @@
                     { "stdlibs": ["libstdc++", "libc++"],
                       "tests": [
                         "Debug.Default", "Release.Default", "Release.TSan",
-                        "Release.MaxSan", "Debug.Werror"
+                        "Release.MaxSan", "Debug.Werror",
+                        "Debug.-DBEMAN_EXPECTED_USE_MODULES=On"
                       ]
                     }
                   ]
                 },
-                { "cxxversions": ["c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++23"],
+                  "tests": [
+                    { "stdlibs": ["libstdc++", "libc++"],
+                      "tests": [
+                        "Release.Default", "Debug.-DBEMAN_EXPECTED_USE_MODULES=On"
+                      ]
+                    }
+                  ]
+                },
+                { "cxxversions": ["c++20"],
                   "tests": [
                     {"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
                   ]
@@ -92,19 +131,29 @@
             },
             { "versions": ["21", "20", "19"],
               "tests": [
-                { "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++26", "c++23", "c++20"],
                   "tests": [
                     {"stdlibs": ["libstdc++", "libc++"], "tests": ["Release.Default"]}
                   ]
                 }
               ]
             },
-            { "versions": ["18", "17"],
+            { "versions": ["18"],
+              "tests": [
+                { "cxxversions": ["c++26", "c++23", "c++20"],
+                  "tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
+                },
+                { "cxxversions": ["c++23", "c++20"],
+                  "tests": [{"stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
+                }
+              ]
+            },
+            { "versions": ["17"],
               "tests": [
-                { "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++26", "c++23", "c++20"],
                   "tests": [{"stdlibs": ["libc++"], "tests": ["Release.Default"]}]
                 },
-                { "cxxversions": ["c++20", "c++17"],
+                { "cxxversions": ["c++20"],
                   "tests": [{"stdlibs": ["libstdc++"], "tests": ["Release.Default"]}]
                 }
               ]
@@ -113,7 +162,7 @@
           "appleclang": [
             { "versions": ["latest"],
               "tests": [
-                { "cxxversions": ["c++26", "c++23", "c++20", "c++17"],
+                { "cxxversions": ["c++26", "c++23", "c++20"],
                   "tests": [{ "stdlibs": ["libc++"], "tests": ["Release.Default"]}]
                 }
               ]
@@ -125,7 +174,10 @@
                 { "cxxversions": ["c++23"],
                   "tests": [
                     { "stdlibs": ["stl"],
-                      "tests": ["Debug.Default", "Release.Default", "Release.MaxSan"]
+                      "tests": [
+                        "Debug.Default", "Release.Default", "Release.MaxSan",
+                        "Debug.-DBEMAN_EXPECTED_USE_MODULES=On"
+                      ]
                     }
                   ]
                 }
@@ -134,7 +186,17 @@
           ]
         }
 
+  vcpkg-ci:
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-ci.yml@1.7.2
+    with:
+      port_name: beman-expected
+      feature_combinations: |
+        [
+          {"features": {}},
+          {"features": {"modules": true}}
+        ]
+
   create-issue-when-fault:
     needs: [preset-test, build-and-test]
     if: failure() && github.event_name == 'schedule'
     uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-create-issue-when-fault.yml@1.7.2

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

@@ -5,7 +5,7 @@ name: Weekly pre-commit autoupdate
 on:
   workflow_dispatch:
   schedule:
-    - cron: "0 16 * * 0"
+    - cron: "50 7 * * 4"
 
 jobs:
   auto-update-pre-commit:

.github/workflows/vcpkg-release.yml

@@ -0,0 +1,14 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
+
+name: vcpkg registry release
+on:
+  release:
+    types: [published]
+jobs:
+  vcpkg-release:
+    permissions: {}
+    uses: bemanproject/infra-workflows/.github/workflows/reusable-beman-vcpkg-release.yml@1.7.2
+    with:
+      port_name: beman-expected
+    secrets:
+      VCPKG_REGISTRY_TOKEN: ${{ secrets.VCPKG_REGISTRY_TOKEN }}

.gitignore

@@ -10,8 +10,15 @@
 
 # ignore vscode settings
 .vscode
+
+# ignore vim swap files
+.swp
+
+# ignore merge/patch backup files
+.orig
 /.build/
 /.install/
 /.update-submodules
 /uv.lock
 .build
+/.claude/

.markdownlint.yaml

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # MD033/no-inline-html : Inline HTML : https://github.com/DavidAnson/markdownlint/blob/v0.35.0/doc/md033.md
 # Disable inline html linter is needed for <details> <summary>
 MD033: false

.pre-commit-config.yaml

@@ -1,3 +1,4 @@
+# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 # See https://pre-commit.com for more information
 # See https://pre-commit.com/hooks.html for more hooks
 repos:
@@ -13,14 +14,14 @@ repos:
   # 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.3
+    rev: v22.1.4
     hooks:
       - id: clang-format
         types_or: [c++, c]
 
   # CMake linting and formatting
-  - repo: https://github.com/BlankSpruce/gersemi
-    rev: 0.26.1
+  - repo: https://github.com/BlankSpruce/gersemi-pre-commit
+    rev: 0.27.2
     hooks:
       - id: gersemi
         name: CMake linting
@@ -42,4 +43,10 @@ repos:
         additional_dependencies:
           - tomli
 
-exclude: 'cookiecutter/|infra/'
+  #   # Beman Standard checking via beman-tidy
+  # - repo: https://github.com/bemanproject/beman-tidy
+  #   rev: v0.3.1
+  #   hooks:
+  #   - id: beman-tidy
+
+exclude: 'template/|copier/|infra/|port/'

CMakeLists.txt

@@ -1,11 +1,12 @@
 # CMakeLists.txt                                                    -*-cmake-*-
 # SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 
-cmake_minimum_required(VERSION 3.28...4.2)
+cmake_minimum_required(VERSION 3.30...4.3)
+
+include(infra/cmake/enable-experimental-import-std.cmake)
 
 project(
-    beman.expected # CMake Project Name, which is also the name of the top-level
-    # targets (e.g., library, executable, etc.).
+    beman.expected
     DESCRIPTION "Expected Over References"
     LANGUAGES CXX
     VERSION 0.1.0
@@ -25,25 +26,70 @@ option(
     ${PROJECT_IS_TOP_LEVEL}
 )
 
-# for find of beman-install-library
-include(infra/cmake/beman-install-library-config.cmake)
+option(BEMAN_EXPECTED_USE_MODULES "Provide beman.expected as a C++ module" OFF)
 
-add_library(beman.expected INTERFACE)
-add_library(beman::expected ALIAS beman.expected)
+if(BEMAN_EXPECTED_USE_MODULES)
+    set(CMAKE_CXX_SCAN_FOR_MODULES ON)
+endif()
 
-target_sources(
-    beman.expected
-    PUBLIC FILE_SET HEADERS BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
+configure_file(
+    "${PROJECT_SOURCE_DIR}/include/beman/expected/config_generated.hpp.in"
+    "${PROJECT_BINARY_DIR}/include/beman/expected/config_generated.hpp"
+    @ONLY
 )
 
-set_target_properties(beman.expected PROPERTIES VERIFY_INTERFACE_HEADER_SETS ON)
+# for find of beman_install_library and configure_build_telemetry
+include(infra/cmake/beman-install-library.cmake)
+include(infra/cmake/BuildTelemetryConfig.cmake)
+
+if(BEMAN_EXPECTED_USE_MODULES)
+    add_library(beman.expected STATIC)
+else()
+    add_library(beman.expected INTERFACE)
+endif()
+add_library(beman::expected ALIAS beman.expected)
+
+if(BEMAN_EXPECTED_USE_MODULES)
+    target_sources(
+        beman.expected
+        PUBLIC
+            FILE_SET CXX_MODULES
+            FILE_SET HEADERS
+                BASE_DIRS
+                    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                    "${CMAKE_CURRENT_BINARY_DIR}/include"
+    )
+    set_target_properties(beman.expected PROPERTIES CXX_MODULE_STD ON)
+    target_compile_features(beman.expected PUBLIC cxx_std_23)
+else()
+    target_sources(
+        beman.expected
+        PUBLIC
+            FILE_SET HEADERS
+                BASE_DIRS
+                    "${CMAKE_CURRENT_SOURCE_DIR}/include"
+                    "${CMAKE_CURRENT_BINARY_DIR}/include"
+    )
+    set_target_properties(
+        beman.expected
+        PROPERTIES VERIFY_INTERFACE_HEADER_SETS ${PROJECT_IS_TOP_LEVEL}
+    )
+endif()
 
 add_subdirectory(include/beman/expected)
 
-beman_install_library(beman.expected)
+beman_install_library(beman.expected TARGETS beman.expected)
+configure_build_telemetry()
 
 if(BEMAN_EXPECTED_BUILD_TESTS)
-    find_package(GTest CONFIG REQUIRED)
+    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)