Revert "Move convenience header to beman/big_int/big_int.hpp (#391)"

CMakeLists.txt

@@ -375,8 +375,7 @@ target_sources(
     PUBLIC
         FILE_SET HEADERS
             BASE_DIRS "${CMAKE_CURRENT_SOURCE_DIR}/include"
-            FILES
-                "${CMAKE_CURRENT_SOURCE_DIR}/include/beman/big_int/big_int.hpp"
+            FILES "${CMAKE_CURRENT_SOURCE_DIR}/include/beman/big_int.hpp"
 )
 
 set_target_properties(

docs/modules/ROOT/pages/build_and_usage.adoc

@@ -283,7 +283,7 @@ To use `beman.big_int` in your pass:[C++] project, include an appropriate
 
 [source,c++]
 ----
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 ----
 
 [NOTE]
@@ -305,7 +305,7 @@ verifies the value of 100! in its full, pure-integral, non-truncated form:
 
 [source,c++]
 ----
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iomanip>
 #include <iostream>

docs/modules/ROOT/pages/format.adoc

@@ -15,7 +15,7 @@ that formats an `int` formats a `basic_big_int` the same way, only without a
 fixed-width ceiling on the value.
 
 Include the formatter with `<beman/big_int/format.hpp>`, or transitively
-through the umbrella `<beman/big_int/big_int.hpp>`. The header is self-guarding: its
+through the umbrella `<beman/big_int.hpp>`. The header is self-guarding: its
 entire contents are conditioned on
 
 [source,c++]

docs/modules/ROOT/pages/limits.adoc

@@ -8,7 +8,7 @@
 `<beman/big_int/limits.hpp>` specializes `std::numeric_limits` for every
 `basic_big_int`, so generic code can query the type the same way it queries
 `int` or `double`. Include it directly, or transitively through the umbrella
-`<beman/big_int/big_int.hpp>`.
+`<beman/big_int.hpp>`.
 
 `basic_big_int` is *unbounded*: it grows to fit its value, so it has no largest
 or smallest value for the specialization to report. Every value-returning

docs/modules/ROOT/pages/modules.adoc

@@ -21,7 +21,7 @@ xref:modules.adoc#modules_limitations[Limitations].
 [#modules_exports]
 == What the module exports
 
-The module covers the entire public interface that `<beman/big_int/big_int.hpp>`
+The module covers the entire public interface that `<beman/big_int.hpp>`
 provides. Importing it brings the following into scope, from the
 `beman::big_int` namespace unless noted otherwise:
 
@@ -288,7 +288,7 @@ merely a style preference: linking the module target defines
 under that macro the library's public declarations are marked `export`. An
 `export` declaration outside a module's purview is ill-formed, so a
 translation unit that both imports the module and textually includes, say,
-`<beman/big_int/big_int.hpp>`, fails to compile -- on every conforming compiler, not
+`<beman/big_int.hpp>`, fails to compile -- on every conforming compiler, not
 as a quality-of-implementation difference some toolchains happen to tolerate.
 
 What *is* supported, and is the more useful fact here, is mixing the two

docs/modules/ROOT/pages/numeric.adoc

@@ -9,7 +9,7 @@
 `basic_big_int` values. They live in the `beman::big_int` namespace and are
 found by argument-dependent lookup, so an unqualified `abs(x)` resolves to them
 when `x` is a `basic_big_int`. Include them with `<beman/big_int/numeric.hpp>`,
-or transitively through the umbrella `<beman/big_int/big_int.hpp>`.
+or transitively through the umbrella `<beman/big_int.hpp>`.
 
 [#numeric_synopsis]
 == Synopsis

examples/charconv.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <array>
 #include <charconv>

examples/construction.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <array>
 #include <iostream>

examples/division.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iostream>
 

examples/factorial.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iomanip>
 #include <iostream>

examples/fibonacci.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iomanip>
 #include <iostream>

examples/io.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iostream>
 #include <string>

examples/limits.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <cstdint>
 #include <iostream>

examples/literals.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iostream>
 

examples/numeric.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iostream>
 #include <limits>

examples/operators.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <compare>
 #include <iostream>

examples/primes.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iomanip>
 #include <iostream>

examples/roots.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iomanip>
 #include <iostream>

examples/rsa.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <array>
 #include <charconv>

examples/string.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include <iostream>
 #include <string>

include/beman/big_int/big_int.hpp → include/beman/big_int.hpp

@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#ifndef BEMAN_BIG_INT_BIG_INT_HPP
-#define BEMAN_BIG_INT_BIG_INT_HPP
+#ifndef BEMAN_BIG_INT_HPP
+#define BEMAN_BIG_INT_HPP
 
 // Convenience header that pulls in the entire beman::big_int library.
 // Include this when you want the arbitrary-precision integer type together
@@ -19,4 +19,4 @@
 #include <beman/big_int/format.hpp>
 #include <beman/big_int/numeric.hpp>
 
-#endif // BEMAN_BIG_INT_BIG_INT_HPP
+#endif // BEMAN_BIG_INT_HPP

module/CMakeLists.txt

@@ -35,7 +35,7 @@ target_link_libraries(beman.big_int_module PUBLIC beman::big_int)
 target_compile_features(beman.big_int_module PUBLIC cxx_std_23)
 
 # big_int.cppm defines BEMAN_BIG_INT_BUILD_MODULE itself, but consumers need the
-# macro too so that including <beman/big_int/big_int.hpp> transitively (e.g. through
+# macro too so that including <beman/big_int.hpp> transitively (e.g. through
 # another header) resolves onto the module path instead of the header path.
 target_compile_definitions(
     beman.big_int_module

module/big_int.cppm

@@ -103,7 +103,7 @@ extern "C++" {
     #pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
 #endif
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #ifdef _MSC_VER
     #pragma warning(pop)

tests/beman/big_int/abs.test.cpp

@@ -11,7 +11,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/addition.test.cpp

@@ -6,7 +6,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/addition_bench.test.cpp

@@ -2,7 +2,7 @@
 // SPDX-License-Identifier: BSL-1.0
 
 #include <boost/multiprecision/cpp_int.hpp>
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <gtest/gtest.h>
 #include <span>
 

tests/beman/big_int/allocation.test.cpp

@@ -7,7 +7,7 @@
 #include <type_traits>
 #include <utility>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <gtest/gtest.h>
 
 #include "testing.hpp"

tests/beman/big_int/base_conversion_bench.test.cpp

@@ -31,7 +31,7 @@
 //
 // Output is CSV on stdout: kernel,base,digits,chunks,ns_per_op.
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <beman/big_int/detail/base_conversion.hpp>
 
 #include <gtest/gtest.h>

tests/beman/big_int/basic_construction.test.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <gtest/gtest.h>
 
 #include "testing.hpp"

tests/beman/big_int/big_int.test.cpp

@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/bit_shift.test.cpp

@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/boost_mp_testing.hpp

@@ -8,7 +8,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 BEMAN_BIG_INT_DIAGNOSTIC_PUSH()
 BEMAN_BIG_INT_DIAGNOSTIC_IGNORED_GCC("-Warray-bounds") // This causes way too many problems.

tests/beman/big_int/charconv.test.cpp

@@ -15,7 +15,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/comparison.test.cpp

@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/conversion.test.cpp

@@ -4,7 +4,7 @@
 #include <gtest/gtest.h>
 #include <limits>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/copy_to_runtime.test.cpp

@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
 // SPDX-License-Identifier: BSL-1.0
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <gtest/gtest.h>
 
 #include "testing.hpp"

tests/beman/big_int/division.test.cpp

@@ -10,7 +10,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <beman/big_int/detail/span_ops.hpp>
 #include <beman/big_int/detail/wide_ops.hpp>
 

tests/beman/big_int/division_barrett_exercise.test.cpp

@@ -7,7 +7,7 @@
 // small operands plus reciprocal-threshold overrides cover deep Newton
 // recursion and every correction path cheaply.
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <beman/big_int/detail/div_impl.hpp>
 #include <beman/big_int/detail/mul_impl.hpp>
 #include <beman/big_int/detail/span_ops.hpp>

tests/beman/big_int/division_dc.test.cpp

@@ -5,7 +5,7 @@
 
 #include <gtest/gtest.h>
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 
 #include "testing.hpp"
 

tests/beman/big_int/division_divappr.test.cpp

@@ -7,7 +7,7 @@
 // divisor halves), the saturated 3-by-2 fast path (top window pairs equal
 // to the divisor's), exact multiples, and near-misses on both sides.
 
-#include <beman/big_int/big_int.hpp>
+#include <beman/big_int.hpp>
 #include <beman/big_int/detail/div_impl.hpp>
 
 #include <gtest/gtest.h>