From cc60bce275690d48414125bb2ef9b2c9da3ec501 Mon Sep 17 00:00:00 2001
From: jzmaddock <john@johnmaddock.co.uk>
Date: Thu, 18 Apr 2024 18:14:44 +0100
Subject: [PATCH] Correct module implementation units. Update script
 permissions.

---
 module/regex.cxx                |  1 +
 module/regex_create_char.cpp    | 11 -----------
 module/regex_create_wchar_t.cpp | 11 -----------
 module/regex_nc_sfind.cpp       | 11 -----------
 module/regex_nc_smatch.cpp      | 11 -----------
 module/regex_nc_wsfind.cpp      | 11 -----------
 module/regex_nc_wsmatch.cpp     | 11 -----------
 module/regex_sfind.cpp          | 11 -----------
 module/regex_smatch.cpp         | 11 -----------
 module/regex_wsfind.cpp         | 11 -----------
 module/regex_wsmatch.cpp        | 11 -----------
 test/module/test_clang.sh       |  0
 12 files changed, 1 insertion(+), 110 deletions(-)
 mode change 100644 => 100755 test/module/test_clang.sh

diff --git a/module/regex.cxx b/module/regex.cxx
index a19c51e3..29d3bff8 100644
--- a/module/regex.cxx
+++ b/module/regex.cxx
@@ -67,6 +67,7 @@ module;
 
 #if !defined(BOOST_REGEX_USE_STD_MODULE) && defined(MSVC_EXPERIMENTAL_STD_MODULE)
 #include <cwchar>
+#include <cwctype>
 #endif
 
 #ifdef BOOST_REGEX_HAS_ICU_HEADERS
diff --git a/module/regex_create_char.cpp b/module/regex_create_char.cpp
index 7eabb95a..5ca475dd 100644
--- a/module/regex_create_char.cpp
+++ b/module/regex_create_char.cpp
@@ -3,23 +3,12 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <memory>
-
-#endif
-
 #ifndef BOOST_REGEX_DETAIL_NS
 #define BOOST_REGEX_DETAIL_NS re_detail_600
 #endif
 
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::detail {
 
    std::shared_ptr<BOOST_REGEX_DETAIL_NS::basic_regex_implementation<char, basic_regex<char>::traits_type> >
diff --git a/module/regex_create_wchar_t.cpp b/module/regex_create_wchar_t.cpp
index 0d733f0d..eb65c740 100644
--- a/module/regex_create_wchar_t.cpp
+++ b/module/regex_create_wchar_t.cpp
@@ -3,23 +3,12 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <memory>
-
-#endif
-
 #ifndef BOOST_REGEX_DETAIL_NS
 #define BOOST_REGEX_DETAIL_NS re_detail_600
 #endif
 
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::detail {
 
    std::shared_ptr<BOOST_REGEX_DETAIL_NS::basic_regex_implementation<wchar_t, basic_regex<wchar_t>::traits_type> >
diff --git a/module/regex_nc_sfind.cpp b/module/regex_nc_sfind.cpp
index 1cd193c0..0028d9ff 100644
--- a/module/regex_nc_sfind.cpp
+++ b/module/regex_nc_sfind.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_find(perl_matcher<std::string::iterator, match_results<std::string::iterator>::allocator_type, regex::traits_type>& m)
diff --git a/module/regex_nc_smatch.cpp b/module/regex_nc_smatch.cpp
index cb76c66d..3be778d6 100644
--- a/module/regex_nc_smatch.cpp
+++ b/module/regex_nc_smatch.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_match(perl_matcher<std::string::iterator, match_results<std::string::iterator>::allocator_type, regex::traits_type>& m)
diff --git a/module/regex_nc_wsfind.cpp b/module/regex_nc_wsfind.cpp
index cccfc678..3fc31106 100644
--- a/module/regex_nc_wsfind.cpp
+++ b/module/regex_nc_wsfind.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_find(perl_matcher<std::wstring::iterator, match_results<std::wstring::iterator>::allocator_type, wregex::traits_type>& m)
diff --git a/module/regex_nc_wsmatch.cpp b/module/regex_nc_wsmatch.cpp
index d18339e0..a07feb5d 100644
--- a/module/regex_nc_wsmatch.cpp
+++ b/module/regex_nc_wsmatch.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_match(perl_matcher<std::wstring::iterator, match_results<std::wstring::iterator>::allocator_type, wregex::traits_type>& m)
diff --git a/module/regex_sfind.cpp b/module/regex_sfind.cpp
index e0d68bf4..c2736874 100644
--- a/module/regex_sfind.cpp
+++ b/module/regex_sfind.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_find(perl_matcher<std::string::const_iterator, match_results<std::string::const_iterator>::allocator_type, regex::traits_type>& m)
diff --git a/module/regex_smatch.cpp b/module/regex_smatch.cpp
index 2434cddb..b1bbc653 100644
--- a/module/regex_smatch.cpp
+++ b/module/regex_smatch.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_match(perl_matcher<std::string::const_iterator, match_results<std::string::const_iterator>::allocator_type, regex::traits_type>& m)
diff --git a/module/regex_wsfind.cpp b/module/regex_wsfind.cpp
index 16239941..4bcbcceb 100644
--- a/module/regex_wsfind.cpp
+++ b/module/regex_wsfind.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_find(perl_matcher<std::wstring::const_iterator, match_results<std::wstring::const_iterator>::allocator_type, wregex::traits_type>& m)
diff --git a/module/regex_wsmatch.cpp b/module/regex_wsmatch.cpp
index 5c50ef8f..11cf6edd 100644
--- a/module/regex_wsmatch.cpp
+++ b/module/regex_wsmatch.cpp
@@ -3,19 +3,8 @@
 #define BOOST_REGEX_USE_STD_MODULE
 #endif
 
-#ifndef BOOST_REGEX_USE_STD_MODULE
-module;
-
-#include <string>
-
-#endif
-
 module boost.regex;
 
-#ifdef BOOST_REGEX_USE_STD_MODULE
-import std;
-#endif
-
 namespace boost::re_detail_600 {
 
    bool factory_match(perl_matcher<std::wstring::const_iterator, match_results<std::wstring::const_iterator>::allocator_type, wregex::traits_type>& m)
diff --git a/test/module/test_clang.sh b/test/module/test_clang.sh
old mode 100644
new mode 100755