rename defines and enable module and std module in tests

serge-sans-paille · Oct 27, 2024 · c388069 · c388069
1 parent ae92a79
commit c388069
Show file tree

Hide file tree

Showing 36 changed files with 275 additions and 97 deletions.
diff --git a/examples/enum_to_string.cpp b/examples/enum_to_string.cpp
@@ -1,5 +1,3 @@
-#include <cstdio> // for std::puts
-
 /* ELF Relocations */
 
 #define ELF_RELOC(name, value) name = value,
@@ -57,12 +55,19 @@ ELF_RELOC(R_386_NUM,            43)
 
 #ifndef SWITCH_VERSION
 
-#ifdef FROZEN_VERSION
-#include "frozen/map.h"
+#ifdef FROZEN_USE_STD_MODULE
+import std;
 #else
+#include <cstdio>
 #include <map>
 #endif
 
+#ifdef FROZEN_USE_MODULE
+import frozen;
+#else
+#include "frozen/map.h"
+#endif
+
 #ifdef FROZEN_VERSION
 constexpr
 frozen::map<RELOC_i386, const char*, 41>

diff --git a/examples/enum_to_string_hash.cpp b/examples/enum_to_string_hash.cpp
@@ -1,5 +1,3 @@
-#include <cstdio> // for std::puts
-
 /* ELF Relocations */
 
 #define ELF_RELOC(name, value) name = value,
@@ -55,15 +53,23 @@ ELF_RELOC(R_386_IRELATIVE,      42)
 ELF_RELOC(R_386_NUM,            43)
 };
 
-#ifdef FROZEN_VERSION
-#include "frozen/unordered_map.h"
+#ifdef FROZEN_USE_STD_MODULE
+import std;
+#else
+#include <cstdio>
+#include <unordered_map>
+#endif
+
+#ifdef FROZEN_USE_MODULE
+import frozen;
+#else 
+#include <frozen/unordered_map.h>
+#endif
+#include <frozen/bits/elsa.h> // this is not exported by the module
 namespace frozen {
     template <> struct elsa<RELOC_i386> : elsa<int> {
     };
 }
-#else
-#include <unordered_map>
-#endif
 
 #ifdef FROZEN_VERSION
 constexpr

diff --git a/examples/html_entities_map.cpp b/examples/html_entities_map.cpp
@@ -1,17 +1,21 @@
-#ifdef EXAMPLES_USE_MODULE
+#ifdef FROZEN_USE_STD_MODULE
+import std;
+#else
+#include <cstdint>
+#include <utility>
+#endif
+
+#ifdef FROZEN_USE_MODULE
 import frozen;
 #else 
 #include <frozen/unordered_map.h>
 #include <frozen/string.h>
 #endif
 
-#include <cinttypes>
-#include <utility>
-
 struct codes_t
 {
-	uint32_t iCodepoint1;
-	uint32_t iCodepoint2{0};
+  std::uint32_t iCodepoint1;
+  std::uint32_t iCodepoint2{0};
 };
 
 static constexpr std::pair<frozen::string, codes_t> s_Entities[]

diff --git a/examples/pixel_art.cpp b/examples/pixel_art.cpp
@@ -3,15 +3,19 @@ g++ $0 -std=c++14 -Iinclude && ./a.out && rm -f a.out && qiv panda.ppm 1up.ppm
 exit
 #else
 
-#ifdef EXAMPLES_USE_MODULE
+#ifdef FROZEN_USE_STD_MODULE
+import std;
+#else
+#include <array>
+#include <fstream>
+#endif
+
+#ifdef FROZEN_USE_MODULE
 import frozen;
 #else 
 #include <frozen/map.h>
 #endif
 
-#include <array>
-#include <fstream>
-
 constexpr frozen::map<char, std::array<char, 3>, 5> Tans{
     {'R', {(char)0xFF, (char)0x00, (char)0x00}},
     {'G', {(char)0x00, (char)0xFF, (char)0x00}},

diff --git a/examples/static_assert.cpp b/examples/static_assert.cpp
@@ -1,4 +1,4 @@
-#ifdef EXAMPLES_USE_MODULE
+#ifdef FROZEN_USE_MODULE
 import frozen;
 #else 
 #include <frozen/set.h>

diff --git a/examples/value_modification.cpp b/examples/value_modification.cpp
@@ -1,13 +1,17 @@
-#ifdef EXAMPLES_USE_MODULE
+#ifdef FROZEN_USE_STD_MODULE
+import std;
+#else
+#include <iostream>
+#endif
+
+#ifdef FROZEN_USE_MODULE
 import frozen;
 #else 
 #include <frozen/set.h>
 #include <frozen/string.h>
 #include <frozen/unordered_map.h>
 #endif
 
-#include <iostream>
-
 /// MAYBE_CONSTINIT expands to `constinit` if available.
 #if __cpp_constinit
 #define MAYBE_CONSTINIT constinit

diff --git a/include/frozen/algorithm.h b/include/frozen/algorithm.h
@@ -167,7 +167,7 @@ template <std::size_t size> class boyer_moore_searcher {
     if (size == 0)
       return { first, first };
 
-    if (size > size_t(last - first))
+    if (size > std::size_t(last - first))
       return { last, last };
 
     RandomAccessIterator iter = first + size - 1;

diff --git a/include/frozen/bits/algorithms.h b/include/frozen/bits/algorithms.h
@@ -25,7 +25,7 @@
 
 #include "frozen/bits/basic_types.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <limits>
 #include <tuple>
 #endif

diff --git a/include/frozen/bits/basic_types.h b/include/frozen/bits/basic_types.h
@@ -25,7 +25,7 @@
 
 #include "frozen/bits/exceptions.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <array>
 #include <utility>
 #include <string>

diff --git a/include/frozen/bits/constexpr_assert.h b/include/frozen/bits/constexpr_assert.h
@@ -23,7 +23,7 @@
 #ifndef FROZEN_LETITGO_CONSTEXPR_ASSERT_H
 #define FROZEN_LETITGO_CONSTEXPR_ASSERT_H
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <cassert>
 #endif
 

diff --git a/include/frozen/bits/elsa.h b/include/frozen/bits/elsa.h
@@ -23,7 +23,7 @@
 #ifndef FROZEN_LETITGO_ELSA_H
 #define FROZEN_LETITGO_ELSA_H
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <type_traits>
 #endif
 

diff --git a/include/frozen/bits/elsa_std.h b/include/frozen/bits/elsa_std.h
@@ -5,7 +5,7 @@
 #include "elsa.h"
 #include "hash_string.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #ifdef FROZEN_LETITGO_HAS_STRING_VIEW
 #include <string_view>
 #endif

diff --git a/include/frozen/bits/exceptions.h b/include/frozen/bits/exceptions.h
@@ -25,14 +25,14 @@
 
 #if defined(FROZEN_NO_EXCEPTIONS) || (defined(_MSC_VER) && !defined(_CPPUNWIND)) || (!defined(_MSC_VER) && !defined(__cpp_exceptions))
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <cstdlib>
 #endif
 #define FROZEN_THROW_OR_ABORT(_) std::abort()
 
 #else
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <stdexcept>
 #endif
 #define FROZEN_THROW_OR_ABORT(err) throw err

diff --git a/include/frozen/bits/hash_string.h b/include/frozen/bits/hash_string.h
@@ -1,7 +1,7 @@
 #ifndef FROZEN_LETITGO_BITS_HASH_STRING_H
 #define FROZEN_LETITGO_BITS_HASH_STRING_H
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <cstddef>
 #endif
 

diff --git a/include/frozen/bits/mpl.h b/include/frozen/bits/mpl.h
@@ -23,7 +23,7 @@
 #ifndef FROZEN_LETITGO_BITS_MPL_H
 #define FROZEN_LETITGO_BITS_MPL_H
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <utility>
 #endif
 

diff --git a/include/frozen/bits/pmh.h b/include/frozen/bits/pmh.h
@@ -27,7 +27,7 @@
 #include "frozen/bits/algorithms.h"
 #include "frozen/bits/basic_types.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <array>
 #include <cstddef>
 #include <cstdint>

diff --git a/include/frozen/map.h b/include/frozen/map.h
@@ -30,7 +30,7 @@
 #include "frozen/bits/mpl.h"
 #include "frozen/bits/version.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <iterator>
 #include <utility>
 #endif

diff --git a/include/frozen/random.h b/include/frozen/random.h
@@ -26,7 +26,7 @@
 #include "frozen/bits/algorithms.h"
 #include "frozen/bits/version.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <cstdint>
 #include <type_traits>
 #endif

diff --git a/include/frozen/set.h b/include/frozen/set.h
@@ -29,7 +29,7 @@
 #include "frozen/bits/version.h"
 #include "frozen/bits/defines.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <iterator>
 #include <utility>
 #endif

diff --git a/include/frozen/string.h b/include/frozen/string.h
@@ -28,7 +28,7 @@
 #include "frozen/bits/version.h"
 #include "frozen/bits/defines.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <cstddef>
 #include <functional>
 

diff --git a/include/frozen/unordered_map.h b/include/frozen/unordered_map.h
@@ -31,7 +31,7 @@
 #include "frozen/bits/version.h"
 #include "frozen/random.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <tuple>
 #include <functional>
 #include <utility>

diff --git a/include/frozen/unordered_set.h b/include/frozen/unordered_set.h
@@ -30,7 +30,7 @@
 #include "frozen/bits/version.h"
 #include "frozen/random.h"
 
-#ifndef FROZEN_DONT_INCLUDE_STL
+#ifndef FROZEN_USE_STD_MODULE
 #include <utility>
 #endif 
 

diff --git a/module/frozen.cppm b/module/frozen.cppm
@@ -20,20 +20,27 @@
  * under the License.
  */
 
+module;
+
+#include <cassert>
+
 export module frozen;
 
-#ifdef FROZEN_DONT_INCLUDE_STL
+#ifdef FROZEN_USE_STD_MODULE
 import std;
 #endif 
 
 extern "C++" {
+#pragma clang diagnostic push
+#pragma clang diagnostic ignored "-Winclude-angled-in-module-purview"
 #include <frozen/algorithm.h>
 #include <frozen/map.h>
 #include <frozen/random.h>
 #include <frozen/set.h>
 #include <frozen/string.h>
 #include <frozen/unordered_set.h>
 #include <frozen/unordered_map.h>
+#pragma clang diagnostic pop
 }
 
 export namespace frozen {

diff --git a/tests/no_exceptions.cpp b/tests/no_exceptions.cpp
@@ -1,4 +1,8 @@
+#ifdef FROZEN_USE_MODULE
+import frozen;
+#else 
 #include <frozen/unordered_map.h>
+#endif
 
 #include <csignal>
 #include <cstdlib>

diff --git a/tests/test_algorithms.cpp b/tests/test_algorithms.cpp
@@ -1,9 +1,15 @@
+// include catch before import std to avoid STL issues
+#include "bench.hpp"
+#include "catch.hpp"
+
+#ifdef FROZEN_USE_STD_MODULE
+import std;
+#else
 #include <algorithm>
-#include <frozen/bits/algorithms.h>
 #include <iostream>
+#endif
 
-#include "bench.hpp"
-#include "catch.hpp"
+#include <frozen/bits/algorithms.h>
 
 TEST_CASE("next_highest_power_of_two", "[algorithm]") {
   REQUIRE(frozen::bits::next_highest_power_of_two(1) == 1);

diff --git a/tests/test_elsa_std.cpp b/tests/test_elsa_std.cpp
@@ -1,20 +1,35 @@
+// include catch before import std to avoid STL issues
+#include "catch.hpp"
+
+#ifdef FROZEN_USE_STD_MODULE
+import std;
+#endif 
+
+#ifdef FROZEN_USE_MODULE
+import frozen;
+#else 
 #include <frozen/bits/defines.h>
+#endif
 
 #ifdef FROZEN_LETITGO_HAS_STRING_VIEW
-
+#ifndef FROZEN_USE_MODULE
 #include <frozen/bits/elsa_std.h>
 #include <frozen/map.h>
 #include <frozen/set.h>
 #include <frozen/unordered_map.h>
 #include <frozen/unordered_set.h>
+#endif
 
-#include "catch.hpp"
-
+#ifndef FROZEN_USE_STD_MODULE
 #include <string_view>
+#include <tuple>
+#endif
 
 #ifdef FROZEN_LETITGO_HAS_CONSTEXPR_STRING
 
+#ifndef FROZEN_USE_STD_MODULE
 #include <string>
+#endif
 
 using StringTypes = std::tuple<std::string_view, std::string>;