Skip to content

Commit

Permalink
Merge branch 'main' into hash
Browse files Browse the repository at this point in the history
  • Loading branch information
steve-downey committed Oct 5, 2024
2 parents 9cef152 + 4c5cd80 commit 41009c5
Show file tree
Hide file tree
Showing 36 changed files with 68 additions and 68 deletions.
2 changes: 1 addition & 1 deletion CITATION.cff
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cff-version: 1.0.0
message: "If you use this software, please cite it as below."
title: "Beman.Optional26"
title: "beman.optional26"
url: "https://github.com/beman-project/Optional26"
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ if(BUILD_TESTING)
FetchContent_MakeAvailable(googletest)
endif()

add_subdirectory(src/Beman/Optional26)
add_subdirectory(src/beman/optional26)
add_subdirectory(examples)

include(GNUInstallDirs)
Expand Down
10 changes: 5 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
# Beman.Optional26: C++26 Extensions for std::optional
# beman.optional26: C++26 Extensions for std::optional

<!--
SPDX-License-Identifier: 2.0 license with LLVM exceptions
-->

![CI Tests](https://github.com/beman-project/Optional26/actions/workflows/ci.yml/badge.svg)

This repository implements `std::optional` extensions targeting C++26. The `Beman.Optional26` library aims to evaluate the stability, the usability, and the performance of these proposed changes before they are officially adopted by WG21 into the C++ Working Draft. Additionally, it allows developers to use these new features before they are implemented in major standard library compilers.
This repository implements `std::optional` extensions targeting C++26. The `beman.optional26` library aims to evaluate the stability, the usability, and the performance of these proposed changes before they are officially adopted by WG21 into the C++ Working Draft. Additionally, it allows developers to use these new features before they are implemented in major standard library compilers.

**Implements**:

Expand All @@ -15,7 +15,7 @@ This repository implements `std::optional` extensions targeting C++26. The `Bema

## Table of Contents

* [Beman.Optional26: C++26 Extensions for std::optional](#bemanoptional26-c26-extensions-for-stdoptional)
* [beman.optional26: C++26 Extensions for std::optional](#bemanoptional26-c26-extensions-for-stdoptional)
* [Table of Contents](#table-of-contents)
* [License](#license)
* [Examples](#examples)
Expand Down Expand Up @@ -232,8 +232,8 @@ $ cmake --build .build --config Asan --target all -- -k 0

# Check that tests are not built/installed.
$ ctest --build-config Asan --output-on-failure --test-dir .build
Internal ctest changing into directory: /path/to/Beman.Optional26/.build
Test project /path/to/Beman.Optional26/.build
Internal ctest changing into directory: /path/to/beman.optional26/.build
Test project /path/to/beman.optional26/.build
No tests were found!!!
```

Expand Down
2 changes: 1 addition & 1 deletion cmake/gcovr.cfg.in
Original file line number Diff line number Diff line change
Expand Up @@ -7,5 +7,5 @@ gcov-parallel = yes
html-theme = github.dark-blue
html-self-contained = yes
print-summary = yes
filter = .*/Beman/Optional26/.*
filter = .*/beman/optional26/.*
exclude = .*\.t\.cpp
2 changes: 1 addition & 1 deletion docs/debug-ci.md
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ Stage Job ID Job name Workflow name Workflow file Events
0 build ${{ matrix.config.name }} CI Tests ci.yml pull_request,push

# Run all CI jobs
Optional26 $ sudo act -P ubuntu-24.04=ghcr.io/catthehacker/ubuntu:full-24.04 --container-architecture linux/amd64 push
optional26 $ sudo act -P ubuntu-24.04=ghcr.io/catthehacker/ubuntu:full-24.04 --container-architecture linux/amd64 push
[CI Tests/Ubuntu Clang 18-2] 🚀 Start image=ghcr.io/catthehacker/ubuntu:full-24.04
[CI Tests/Ubuntu Clang 19-3] 🚀 Start image=ghcr.io/catthehacker/ubuntu:full-24.04
[CI Tests/Ubuntu Clang 17-1] 🚀 Start image=ghcr.io/catthehacker/ubuntu:full-24.04
Expand Down
6 changes: 3 additions & 3 deletions examples/README.md
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# Beman.Optional26 Examples
# Examples for beman.optional26

<!--
SPDX-License-Identifier: 2.0 license with LLVM exceptions
-->

List of usage examples for `Beman.Optional26`.
List of usage examples for `beman.optional26`.

## Samples

Check basic `Beman.Optional26` library usages:
Check basic `beman.optional26` library usages:

* local [./sample.cpp](./sample.cpp) or [sample.cpp@Compiler Explorer](https://godbolt.org/z/47vGje65x)
* local [./std_vs_beman.cpp](./std_vs_beman.cpp) or [std_vs_beman.cpp@Compiler Explorer](https://godbolt.org/z/ds5MvfGe6)
Expand Down
2 changes: 1 addition & 1 deletion examples/concept_checks.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <optional>
#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <concepts>

Expand Down
2 changes: 1 addition & 1 deletion examples/optional_ref.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// examples/optional_ref.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <string>

Expand Down
2 changes: 1 addition & 1 deletion examples/pythagorean_triples.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// examples/pythagorean_triples.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <algorithm>
#include <cassert>
Expand Down
2 changes: 1 addition & 1 deletion examples/range_loop.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// examples/range_loop.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>
#include <iostream>

int main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/sample.cpp
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// examples/sample.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>
#include <iostream>

int main() {
Expand Down
2 changes: 1 addition & 1 deletion examples/std_vs_beman.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <optional>
#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <cassert>
#include <iostream>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// include/Beman/Optional26/detail/iterator.hpp -*-C++-*-
// include/beman/optional26/detail/iterator.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_DETAIL_ITERATOR_HPP
#define BEMAN_OPTIONAL26_DETAIL_ITERATOR_HPP

#include <Beman/Optional26/detail/stl_interfaces/iterator_interface.hpp>
#include <beman/optional26/detail/stl_interfaces/iterator_interface.hpp>

#include <concepts>
#include <iterator>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// include/Beman/Optional26/detail/stl_interfaces/config.hpp -*-C++-*-
// include/beman/optional26/detail/stl_interfaces/config.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// Copyright (C) 2020 T. Zachary Laine
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// include/Beman/Optional26/detail/stl_interfaces/fwd.hpp -*-C++-*-
// include/beman/optional26/detail/stl_interfaces/fwd.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// Copyright (C) 2019 T. Zachary Laine
Expand All @@ -9,7 +9,7 @@
#ifndef BEMAN_OPTIONAL26_DETAIL_STL_INTERFACES_FWD_HPP
#define BEMAN_OPTIONAL26_DETAIL_STL_INTERFACES_FWD_HPP

#include <Beman/Optional26/detail/stl_interfaces/config.hpp>
#include <beman/optional26/detail/stl_interfaces/config.hpp>

#if BEMAN_OPTIONAL26_DETAIL_STL_INTERFACES_USE_CONCEPTS
#include <ranges>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// include/Beman/Optional26/detail/stl_interfaces/iterator_interface.hpp -*-C++-*-
// include/beman/optional26/detail/stl_interfaces/iterator_interface.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

// Copyright (C) 2019 T. Zachary Laine
Expand All @@ -9,7 +9,7 @@
#ifndef BEMAN_OPTIONAL26_DETAIL_STL_INTERFACES_ITERATOR_INTERFACE_HPP
#define BEMAN_OPTIONAL26_DETAIL_STL_INTERFACES_ITERATOR_INTERFACE_HPP

#include <Beman/Optional26/detail/stl_interfaces/fwd.hpp>
#include <beman/optional26/detail/stl_interfaces/fwd.hpp>

#include <utility>
#include <type_traits>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// include/Beman/Optional26/optional.hpp -*-C++-*-
// include/beman/optional26/optional.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_OPTIONAL_HPP
Expand Down Expand Up @@ -175,7 +175,7 @@ namespace std {
#include <type_traits>
#include <utility>

#include <Beman/Optional26/detail/iterator.hpp>
#include <beman/optional26/detail/iterator.hpp>

namespace beman::optional26 {

Expand Down
4 changes: 0 additions & 4 deletions src/Beman/Optional26/detail/iterator.cpp

This file was deleted.

4 changes: 0 additions & 4 deletions src/Beman/Optional26/optional.cpp

This file was deleted.

4 changes: 0 additions & 4 deletions src/Beman/Optional26/tests/test_types.cpp

This file was deleted.

4 changes: 0 additions & 4 deletions src/Beman/Optional26/tests/test_utilities.cpp

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# cmake-format: off
# src/Beman/Optional26/CMakeLists.txt -*-makefile-*-
# src/beman/optional26/CMakeLists.txt -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# cmake-format: on

Expand Down
4 changes: 4 additions & 0 deletions src/beman/optional26/detail/iterator.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// src/beman/optional26/detail/iterator.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <beman/optional26/detail/iterator.hpp>
4 changes: 4 additions & 0 deletions src/beman/optional26/optional.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// src/beman/optional26/optional.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <beman/optional26/optional.hpp>
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# cmake-format: off
# src/Beman/Optional26/tests/CMakeLists.txt -*-makefile-*-
# src/beman/optional26/tests/CMakeLists.txt -*-makefile-*-
# SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
# cmake-format: on

Expand Down
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
// src/Beman/Optional26/tests/detail/iterator.t.cpp -*-C++-*-
// src/beman/optional26/tests/detail/iterator.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

/**
* This file contains tests for beman::optional26::detail::contiguous_iterator.
*/
#include <Beman/Optional26/detail/iterator.hpp>
#include <beman/optional26/detail/iterator.hpp>

#include <gtest/gtest.h>
#include <tests/test_types.hpp>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
// src/Beman/Optional26/tests/optional.t.cpp -*-C++-*-
// src/beman/optional26/tests/optional.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <Beman/Optional26/optional.hpp> // test 2nd include OK
#include <beman/optional26/optional.hpp> // test 2nd include OK

#include <Beman/Optional26/tests/test_types.hpp>
#include <beman/optional26/tests/test_types.hpp>

#include <functional>
#include <ranges>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
// src/Beman/Optional26/tests/optional_constexpr.t.cpp -*-C++-*-
// src/beman/optional26/tests/optional_constexpr.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <Beman/Optional26/tests/test_types.hpp>
#include <Beman/Optional26/tests/test_utilities.hpp>
#include <beman/optional26/optional.hpp>
#include <beman/optional26/tests/test_types.hpp>
#include <beman/optional26/tests/test_utilities.hpp>

#include <functional>
#include <ranges>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/Beman/Optional26/tests/optional_monadic.t.cpp -*-C++-*-
// src/beman/optional26/tests/optional_monadic.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <gtest/gtest.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// src/Beman/Optional26/tests/optional_range_support.t.cpp -*-C++-*-
// src/beman/optional26/tests/optional_range_support.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

/**
Expand All @@ -8,12 +8,12 @@
*
* Classes used in the tests: int, pointers, empty, no_default_ctor, base, derived.
*/
#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <gtest/gtest.h>

#include <Beman/Optional26/detail/iterator.hpp>
#include <Beman/Optional26/tests/test_types.hpp>
#include <beman/optional26/detail/iterator.hpp>
#include <beman/optional26/tests/test_types.hpp>

#include <algorithm>
#include <concepts>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
// src/Beman/Optional26/tests/optional_ref.t.cpp -*-C++-*-
// src/beman/optional26/tests/optional_ref.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <Beman/Optional26/tests/test_types.hpp>
#include <beman/optional26/optional.hpp>
#include <beman/optional26/tests/test_types.hpp>

#include <gtest/gtest.h>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
// src/Beman/Optional26/tests/optional_ref_monadic.t.cpp -*-C++-*-
// src/beman/optional26/tests/optional_ref_monadic.t.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <Beman/Optional26/optional.hpp>
#include <beman/optional26/optional.hpp>

#include <gtest/gtest.h>

Expand Down
4 changes: 4 additions & 0 deletions src/beman/optional26/tests/test_types.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// src/beman/optional26/test/test_types.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <beman/optional26/tests/test_types.hpp>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// src/Beman/Optional26/tests/test_types.h -*-C++-*-
// src/beman/optional26/tests/test_types.h -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_TESTS_TEST_TYPES_HPP
Expand Down
4 changes: 4 additions & 0 deletions src/beman/optional26/tests/test_utilities.cpp
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
// src/beman/optional26/test/test_utilities.cpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#include <beman/optional26/tests/test_utilities.hpp>
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
// src/Beman/Optional26/tests/test_utilities.hpp -*-C++-*-
// src/beman/optional26/tests/test_utilities.hpp -*-C++-*-
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception

#ifndef BEMAN_OPTIONAL26_TESTS_TEST_UTILITIES_HPP
Expand Down

0 comments on commit 41009c5

Please sign in to comment.