Hide key template instances behind factory functions.

And provide a separate "module library"
Update testing scripts.

test/module/config/Jamfile.v2

@@ -1,17 +0,0 @@
-# copyright John Maddock 2022
-# Distributed under the Boost Software License, Version 1.0. 
-# (See accompanying file LICENSE_1_0.txt or copy at 
-# http://www.boost.org/LICENSE_1_0.txt.
-
-project
-    : requirements 
-      <threading>multi 
-      <toolset>msvc:<asynch-exceptions>on
-      <toolset>msvc:<cxxstd>latest
-      <toolset>gcc:<cxxflags>-fmodules-ts
-    ;
-
-
-obj has_module_support : has_module_support.cpp : <toolset>msvc:<cxxflags>-interface ;
-exe test_has_module_support : test_has_module_support.cpp has_module_support : <dependency>has_module_support ;
-explicit test_has_module_support ;

test/module/config/clang.sh

@@ -1,36 +0,0 @@
-#!/bin/sh
-
-#
-# Arguments are:
-#
-# 1) A space spearated list of source files.
-# 2) A space separated list of module source files.
-# 3) The name of the executable to build.
-#
-# Environment variables used are:
-#
-# CXX - the name of the clang compiler, defaults to clang++.
-# CXXFLAGS - flags to pass to the build, defaults to "-std=c++20 -g".
-# LINKFLAGS - flags to pass to the link stage, defaults to "".
-# LIBRARIES - Additional libraries to add to the end of the link command line, defaults to "".
-#
-
-: ${CXX:="clang++"}
-: ${CXXFLAGS:="-std=c++20 -g"}
-
-module_usage=""
-
-for module_file in $2; do
-module_base="${module_file%.*}"
-$CXX $CXXFLAGS -x c++-module $module_file --precompile -o $module_base.pcm || exit 1
-
-# grab the name of the exported module from the source:
-cxx_module_name=$(grep -E "export[ ]+module[ ]+([^; ]+)" $module_file | sed -r "s/export[ ]+module[ ]+([^; ]+)[ ]*;/\1/")
-
-# Build the command line for module usage:
-module_usage="$module_usage -fmodule-file=$cxx_module_name=$module_base.pcm $module_base.pcm"
-
-done
-
-# Build the actual executable:
-$CXX $CXXFLAGS $1 $module_usage $LIBRARIES -o $3 || exit 1

test/module/config/has_module_support.cpp

@@ -1,26 +0,0 @@
-/*
- *
- * Copyright (c) 2022
- * John Maddock
- *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
- * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-module;
-
-#include <memory>
-
-export module test_support;
-
-export template <class T> struct pimpl
-{
-private:
-   std::shared_ptr<T> data;
-public:
-   pimpl(const T& x) : data(new T(x)) {}
-   pimpl() = default;
-};
-

test/module/config/test_has_module_support.cpp

@@ -1,17 +0,0 @@
-/*
- *
- * Copyright (c) 2022
- * John Maddock
- *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
- * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
-import test_support;
-
-int main()
-{
-   pimpl<int> p1, p2(3);
-}

test/module/credit_card_example.cpp

@@ -16,9 +16,9 @@
   *   DESCRIPTION: Credit card number formatting code.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/icu_example.cpp

@@ -1,188 +0,0 @@
-/*
- *
- * Copyright (c) 2004
- * John Maddock
- *
- * Use, modification and distribution are subject to the 
- * Boost Software License, Version 1.0. (See accompanying file 
- * LICENSE_1_0.txt or copy at http://www.boost.org/LICENSE_1_0.txt)
- *
- */
-
- /*
-  *   LOCATION:    see http://www.boost.org for most recent version.
-  *   FILE         mfc_example.cpp
-  *   VERSION      see <boost/version.hpp>
-  *   DESCRIPTION: examples of using Boost.Regex with MFC and ATL string types.
-  */
-
-#include <boost/regex/config.hpp>
-
-#ifdef BOOST_HAS_ICU
-
-#include <boost/regex/icu.hpp>
-#include <iostream>
-#include <assert.h>
-
-//
-// Find out if *password* meets our password requirements,
-// as defined by the regular expression *requirements*.
-//
-bool is_valid_password(const U_NAMESPACE_QUALIFIER UnicodeString& password, const U_NAMESPACE_QUALIFIER UnicodeString& requirements)
-{
-   return boost::u32regex_match(password, boost::make_u32regex(requirements));
-}
-
-//
-// Extract filename part of a path from a UTF-8 encoded std::string and return the result
-// as another std::string:
-//
-std::string get_filename(const std::string& path)
-{
-   boost::u32regex r = boost::make_u32regex("(?:\\A|.*\\\\)([^\\\\]+)");
-   boost::smatch what;
-   if(boost::u32regex_match(path, what, r))
-   {
-      // extract $1 as a std::string:
-      return what.str(1);
-   }
-   else
-   {
-      throw std::runtime_error("Invalid pathname");
-   }
-}
-
-U_NAMESPACE_QUALIFIER UnicodeString extract_greek(const U_NAMESPACE_QUALIFIER UnicodeString& text)
-{
-   // searches through some UTF-16 encoded text for a block encoded in Greek,
-   // this expression is imperfect, but the best we can do for now - searching
-   // for specific scripts is actually pretty hard to do right.
-   boost::u32regex r = boost::make_u32regex(L"[\\x{370}-\\x{3FF}](?:[^[:L*:]]|[\\x{370}-\\x{3FF}])*");
-   boost::u16match what;
-   if(boost::u32regex_search(text, what, r))
-   {
-      // extract $0 as a UnicodeString:
-      return U_NAMESPACE_QUALIFIER UnicodeString(what[0].first, what.length(0));
-   }
-   else
-   {
-      throw std::runtime_error("No Greek found!");
-   }
-}
-
-void enumerate_currencies(const std::string& text)
-{
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
-      "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
-      "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
-      "(?(1)"
-         "|(?(2)"
-            "[[:Cf:][:Cc:][:Z*:]]*"
-         ")"
-         "[[:Sc:]]"
-      ")";
-   boost::u32regex r = boost::make_u32regex(re);
-   boost::u32regex_iterator<std::string::const_iterator> i(boost::make_u32regex_iterator(text, r)), j;
-   while(i != j)
-   {
-      std::cout << (*i)[0] << std::endl;
-      ++i;
-   }
-}
-
-void enumerate_currencies2(const std::string& text)
-{
-   // enumerate and print all the currency symbols, along
-   // with any associated numeric values:
-   const char* re = 
-      "([[:Sc:]][[:Cf:][:Cc:][:Z*:]]*)?"
-      "([[:Nd:]]+(?:[[:Po:]][[:Nd:]]+)?)?"
-      "(?(1)"
-         "|(?(2)"
-            "[[:Cf:][:Cc:][:Z*:]]*"
-         ")"
-         "[[:Sc:]]"
-      ")";
-   boost::u32regex r = boost::make_u32regex(re);
-   boost::u32regex_token_iterator<std::string::const_iterator> 
-      i(boost::make_u32regex_token_iterator(text, r, 1)), j;
-   while(i != j)
-   {
-      std::cout << *i << std::endl;
-      ++i;
-   }
-}
-
-
-//
-// Take a credit card number as a string of digits, 
-// and reformat it as a human readable string with "-"
-// separating each group of four digit;, 
-// note that we're mixing a UTF-32 regex, with a UTF-16
-// string and a UTF-8 format specifier, and it still all 
-// just works:
-//
-const boost::u32regex e = boost::make_u32regex("\\A(\\d{3,4})[- ]?(\\d{4})[- ]?(\\d{4})[- ]?(\\d{4})\\z");
-const char* human_format = "$1-$2-$3-$4";
-
-U_NAMESPACE_QUALIFIER UnicodeString human_readable_card_number(const U_NAMESPACE_QUALIFIER UnicodeString& s)
-{
-   return boost::u32regex_replace(s, e, human_format);
-}
-
-
-int main()
-{
-   // password checks using u32regex_match:
-   U_NAMESPACE_QUALIFIER UnicodeString pwd = "abcDEF---";
-   U_NAMESPACE_QUALIFIER UnicodeString pwd_check = "(?=.*[[:lower:]])(?=.*[[:upper:]])(?=.*[[:punct:]]).{6,}";
-   bool b = is_valid_password(pwd, pwd_check);
-   assert(b);
-   pwd = "abcD-";
-   b = is_valid_password(pwd, pwd_check);
-   assert(!b);
-   // filename extraction with u32regex_match:
-   std::string file = "abc.hpp";
-   file = get_filename(file);
-   assert(file == "abc.hpp");
-   file = "c:\\a\\b\\c\\d.h";
-   file = get_filename(file);
-   assert(file == "d.h");
-
-   // Greek text extraction with u32regex_search:
-   const UChar t[] = {
-      'S', 'o', 'm', 'e', ' ', 'w', 'h', 'e', 'r', 'e', ' ', 'i', 'n', 0x0391, 0x039D, 0x0395, 0x0398, 0x0391, 0
-   };
-   const UChar g[] = {
-      0x0391, 0x039D, 0x0395, 0x0398, 0x0391, 0
-   };
-   U_NAMESPACE_QUALIFIER UnicodeString text = t;
-   U_NAMESPACE_QUALIFIER UnicodeString greek = extract_greek(text);
-   assert(greek == g);
-
-   // extract currency symbols with associated value, use iterator interface:
-   std::string text2 = " $100.23 or \xC2\xA3""198.12 "; // \xC2\xA3 is the pound sign encoded in UTF-8
-   enumerate_currencies(text2);
-   enumerate_currencies2(text2);
-
-   U_NAMESPACE_QUALIFIER UnicodeString credit_card_number = "1234567887654321";
-   credit_card_number = human_readable_card_number(credit_card_number);
-   assert(credit_card_number == "1234-5678-8765-4321");
-   return 0;
-}
-
-#else
-
-#include <iostream>
-
-int main()
-{
-   std::cout << "<NOTE>ICU support not enabled, feature unavailable</NOTE>";
-   return 0;
-}
-
-
-#endif
-

test/module/msvc_test.bat

@@ -1,8 +1,26 @@
 REM Basic command line to build everything with msvc:
 
-cl /std:c++latest /EHsc /nologo /W4 /c "%VCToolsInstallDir%\modules\std.ixx"
-cl /std:c++latest /EHsc /nologo /W4 /c /interface /I ..\..\..\.. ..\..\module\regex.cxx
+del *.obj
+del *.exe
+del *.lib
+
+cl /std:c++latest /EHsc /nologo /W4 /c "%VCToolsInstallDir%\modules\std.ixx"  || exit 1
+cl /std:c++latest /EHsc /nologo /W4 /c /interface /I ..\..\..\.. ..\..\module\regex.cxx || exit 1
+cl /std:c++latest /EHsc /nologo /W4 /c /I ..\..\..\.. ..\..\module\*.cpp || exit 1
+
+lib *.obj /OUT:regex.lib || exit 1
+
+time < nul
 
 for %%f in (*.cpp) do (
-   cl /std:c++latest /EHsc /nologo /W4 /I ..\..\..\.. %%f std.obj regex.obj
-)
+   cl /std:c++latest /EHsc /nologo /W4 /I ..\..\..\.. %%f regex.lib || exit 1
+)
+
+time < nul
+
+for %%f in (*.cpp) do (
+   cl /DTEST_HEADERS /std:c++latest /EHsc /nologo /W4 /I ..\..\..\.. %%f || exit 1
+)
+
+time < nul
+

test/module/partial_regex_grep.cpp

@@ -16,9 +16,9 @@
   *   DESCRIPTION: Search example using partial matches.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <iostream>

test/module/partial_regex_iterate.cpp

@@ -16,9 +16,9 @@
   *   DESCRIPTION: Search example using partial matches.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <iostream>

test/module/partial_regex_match.cpp

@@ -19,9 +19,9 @@
 
 //#include <version>
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/regex_grep_example_1.cpp

@@ -16,9 +16,9 @@
   *   DESCRIPTION: regex_grep example 1: searches a cpp file for class definitions.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/regex_grep_example_2.cpp

@@ -17,9 +17,9 @@
   *                using a global callback function.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/regex_grep_example_3.cpp

@@ -17,9 +17,9 @@
   *                using a bound member function callback.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/regex_iterator_example.cpp

@@ -17,9 +17,9 @@
   *                using global data.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/regex_match_example.cpp

@@ -16,9 +16,9 @@
   *   DESCRIPTION: ftp based regex_match example.
   */
   
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <cstdlib>
@@ -33,7 +33,6 @@ import std.core;
 import boost.regex;
 #endif
 
-using namespace std;
 using namespace boost;
 
 regex expression("^([0-9]+)(\\-| |$)(.*)$");
@@ -52,7 +51,7 @@ int process_ftp(const char* response, std::string* msg)
       // what[3] contains the text message.
       if(msg)
          msg->assign(what[3].first, what[3].second);
-      return ::atoi(what[1].first);
+      return std::atoi(what[1].first);
    }
    // failure did not match
    if(msg)
@@ -62,6 +61,7 @@ int process_ftp(const char* response, std::string* msg)
 
 int main(int argc, const char*[])
 {
+   using namespace std;
    std::string in, out;
    do
    {

test/module/regex_merge_example.cpp

@@ -17,9 +17,9 @@
   *                converts a C++ file to syntax highlighted HTML.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <iostream>

test/module/regex_replace_example.cpp

@@ -17,9 +17,9 @@
   *                converts a C++ file to syntax highlighted HTML.
   */
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <iostream>

test/module/regex_search_example.cpp

@@ -16,9 +16,9 @@
   *   DESCRIPTION: regex_search example: searches a cpp file for class definitions.
   */
   
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <string>

test/module/regex_split_example_1.cpp

@@ -17,10 +17,10 @@
   */
 
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
-import std.core;
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
+Simport std.core;
 #else
 #include <list>
 #include <string>

test/module/regex_split_example_2.cpp

@@ -17,9 +17,9 @@
   */
 
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <list>

test/module/regex_token_iterator_eg_1.cpp

@@ -17,9 +17,9 @@
   */
 
 
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <iostream>

test/module/regex_token_iterator_eg_2.cpp

@@ -16,21 +16,22 @@
   *   DESCRIPTION: regex_token_iterator example: spit out linked URL's.
   */
 
-#ifdef TEST_HEADERS
-#include <boost/regex.hpp>
-#else
-import boost.regex;
-#endif
-
-#ifdef __cpp_lib_modules
+#if (defined(__cpp_lib_modules) || (defined(_MSC_FULL_VER) && (_MSC_FULL_VER >= 193933523))) && !defined(TEST_HEADERS)
 import std;
-#elif defined(MSVC_EXPERIMENTAL_STD_MODULE)
+#elif defined(MSVC_EXPERIMENTAL_STD_MODULE) && !defined(TEST_HEADERS)
 import std.core;
 #else
 #include <fstream>
 #include <iostream>
 #include <iterator>
 #endif
+
+#ifdef TEST_HEADERS
+#include <boost/regex.hpp>
+#else
+import boost.regex;
+#endif
+
 boost::regex e("<\\s*A\\s+[^>]*href\\s*=\\s*\"([^\"]*)\"",
                boost::regex::normal | boost::regex::icase);
 

test/module/test.sh

@@ -1,11 +0,0 @@
-#!/bin/sh
-
-#
-# Builds all of the tests in this folder using the supplied compiler-specific script in $1
-#
-
-for file in *.cpp; do
-
-CXXFLAGS="-std=c++20 -g -I ../../../.." $1 $file ../../module/regex.cxx "${file%.*}.exe" || exit 1
-
-done

test/module/test_clang.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+
+#
+# Builds all of the tests in this folder using clang modules
+#
+: ${CXX:="clang++"}
+: ${CXXFLAGS:="-std=c++20 -g -I../../../.."}
+
+rm *.o *.pcm *.exe
+
+cmd="$CXX $CXXFLAGS -x c++-module ../../module/regex.cxx --precompile -o boost.regex.pcm"
+echo $cmd
+$cmd || exit 1
+cmd="$CXX $CXXFLAGS boost.regex.pcm -c -o regex.o"
+echo $cmd
+$cmd || exit 1
+cmd="$CXX $CXXFLAGS -fprebuilt-module-path=. -c ../../module/*.cpp"
+echo $cmd
+$cmd || exit 1
+
+
+for file in *.cpp; do
+
+cmd="$CXX $CXXFLAGS -fprebuilt-module-path=. $file *.o -o ${file%.*}.exe"
+echo $cmd
+$cmd || exit 1
+
+done