From 3e4bcb75b67d81c2c67c91ec9c53d9dffa690dc0 Mon Sep 17 00:00:00 2001 From: jzmaddock Date: Fri, 9 Dec 2022 18:24:24 +0000 Subject: [PATCH] Add testing of standalone mode. Allow tests to be built in standalone mode. Update CI. Update docs. --- .github/workflows/ci.yml | 25 +++++++ .../boost_regex/configuration/standalone.html | 65 +++++++++++++++++++ doc/html/index.html | 2 +- src/posix_api.cpp | 9 ++- src/wide_posix_api.cpp | 7 +- test/regress/basic_tests.cpp | 8 --- test/regress/main.cpp | 7 ++ test/regress/test.hpp | 17 +++++ test/regress/test_icu.cpp | 15 +++++ test/regress/test_mfc.cpp | 2 +- 10 files changed, 142 insertions(+), 15 deletions(-) create mode 100644 doc/html/boost_regex/configuration/standalone.html diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index ec5a5aa6..1976a8d2 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -64,6 +64,31 @@ jobs: - name: Test run: ../../../b2 toolset=$TOOLSET working-directory: ../boost-root/libs/regex/test + ubuntu-focal-standalone: + runs-on: ubuntu-20.04 + strategy: + fail-fast: false + matrix: + compiler: [ g++-9, g++-10 ] + standard: [ c++11, c++14, c++17, c++2a ] + steps: + - uses: actions/checkout@v2 + with: + fetch-depth: '0' + - uses: mstachniuk/ci-skip@v1 + with: + commit-filter: '[skip ci];[ci skip];[CI SKIP];[SKIP CI];***CI SKIP***;***SKIP CI***;[windows];[Windows];[WINDOWS];[apple];[Apple];[APPLE]' + commit-filter-separator: ';' + fail-fast: true + - name: Set TOOLSET + run: echo ${{ matrix.compiler }} | awk '/^g/ { print "TOOLSET=gcc" } /^clang/ { print "TOOLSET=clang" }' >> $GITHUB_ENV + - name: Add repository + run: sudo apt-add-repository -y "ppa:ubuntu-toolchain-r/test" + - name: Install packages + run: sudo apt install g++-9 g++-10 + - name: Test + run: ${{ matrix.compiler }} -std=${{ matrix.standard }} -I../../include *.cpp ../../src/*.cpp -o regress -licuuc -licudata -licu18n && ./regress + working-directory: $GITHUB_WORKSPACE/test/regress ubuntu-bionic: runs-on: ubuntu-18.04 strategy: diff --git a/doc/html/boost_regex/configuration/standalone.html b/doc/html/boost_regex/configuration/standalone.html new file mode 100644 index 00000000..35c7f117 --- /dev/null +++ b/doc/html/boost_regex/configuration/standalone.html @@ -0,0 +1,65 @@ + + + +Use in Standalone Mode (without the rest of Boost) + + + + + + + + + + + + + + + +
Boost C++ LibrariesHomeLibrariesPeopleFAQMore
+
+
+PrevUpHomeNext +
+
+

+Use in Standalone + Mode (without the rest of Boost) +

+

+ This library may now be used in "standalone" mode without the rest + of the Boost C++ libraries, in order to do this you must either: +

+
    +
  • + Have a C++17 compiler that supports __has_include, + in this case if <boost/config.hpp> is not + present then the library will automoatically enter standalone mode. Or: +
    • +
  • + Define BOOST_REGEX_STANDALONE when building. +
    • +
+

+ The main difference between the 2 modes, is that when Boost.Config is present + the library will automatically configure itself around various compiler defects. + In particular in order to use the library with exception support turned off, + you will either need a copy of Boost.Config in your include path, or else + manually define BOOST_NO_EXCEPTIONS when building. +

+
+ + + +
Copyright © 1998-2013 John Maddock

+ 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) +

+
+
+
+PrevUpHomeNext +
+ + diff --git a/doc/html/index.html b/doc/html/index.html index 6e4a4774..4c85c747 100644 --- a/doc/html/index.html +++ b/doc/html/index.html @@ -215,7 +215,7 @@

- +

Last revised: March 08, 2022 at 11:25:00 GMT

Last revised: December 09, 2022 at 16:44:04 GMT
diff --git a/src/posix_api.cpp b/src/posix_api.cpp index 0b44910a..f34a5a16 100644 --- a/src/posix_api.cpp +++ b/src/posix_api.cpp @@ -18,10 +18,8 @@ #define BOOST_REGEX_SOURCE -#include #include #include -#include #include #if defined(BOOST_NO_STDC_NAMESPACE) @@ -32,6 +30,11 @@ namespace std{ } #endif +#ifndef BOOST_WORKAROUND +#define BOOST_WORKAROUND(x, y) false +#endif + + namespace boost{ @@ -88,7 +91,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompA(regex_tA* expression, const char return REG_E_MEMORY; #endif // set default flags: - boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? regex::extended : regex::basic); + unsigned flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? regex::extended : regex::basic); expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default; // and translate those that are actually set: diff --git a/src/wide_posix_api.cpp b/src/wide_posix_api.cpp index 50d1b18d..508acb32 100644 --- a/src/wide_posix_api.cpp +++ b/src/wide_posix_api.cpp @@ -20,11 +20,14 @@ #include +#ifndef BOOST_WORKAROUND +#define BOOST_WORKAROUND(x, y) false +#endif + #ifndef BOOST_NO_WREGEX #include #include -#include #include #include @@ -98,7 +101,7 @@ BOOST_REGEX_DECL int BOOST_REGEX_CCALL regcompW(regex_tW* expression, const wcha return REG_E_MEMORY; #endif // set default flags: - boost::uint_fast32_t flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? wregex::extended : wregex::basic); + unsigned flags = (f & REG_PERLEX) ? 0 : ((f & REG_EXTENDED) ? wregex::extended : wregex::basic); expression->eflags = (f & REG_NEWLINE) ? match_not_dot_newline : match_default; // and translate those that are actually set: diff --git a/test/regress/basic_tests.cpp b/test/regress/basic_tests.cpp index a1a3e817..f8a0952d 100644 --- a/test/regress/basic_tests.cpp +++ b/test/regress/basic_tests.cpp @@ -16,14 +16,6 @@ * DESCRIPTION: main regex test declarations. */ -#include - -#if BOOST_WORKAROUND(BOOST_BORLANDC, < 0x560) -// we get unresolved externals from basic_string -// unless we do this, a well known Borland bug: -#define _RWSTD_COMPILE_INSTANTIATE -#endif - #include "test.hpp" #ifdef BOOST_MSVC diff --git a/test/regress/main.cpp b/test/regress/main.cpp index 8942f717..3f2f82f3 100644 --- a/test/regress/main.cpp +++ b/test/regress/main.cpp @@ -217,6 +217,13 @@ int main(int argc, char * argv[]) return cpp_main(argc, argv); } +#elif defined(BOOST_REGEX_STANDALONE) + +int main(int argc, char* argv[]) +{ + return cpp_main(argc, argv); +} + #else #include diff --git a/test/regress/test.hpp b/test/regress/test.hpp index e9a1b862..eebcdbe9 100644 --- a/test/regress/test.hpp +++ b/test/regress/test.hpp @@ -27,6 +27,23 @@ #pragma warning(disable:1418 981 383 1419 7) #endif +#ifndef BOOST_WORKAROUND +#define BOOST_WORKAROUND(x, y) false +#endif +#ifdef BOOST_REGEX_STANDALONE +#include + +namespace boost { using std::uint32_t; } + +#define BOOST_JOIN(X, Y) BOOST_DO_JOIN(X, Y) +#define BOOST_DO_JOIN(X, Y) BOOST_DO_JOIN2(X,Y) +#define BOOST_DO_JOIN2(X, Y) X##Y + +#define BOOST_STRINGIZE(X) BOOST_DO_STRINGIZE(X) +#define BOOST_DO_STRINGIZE(X) #X + +#endif + #include #include "test_not_regex.hpp" #include "test_regex_search.hpp" diff --git a/test/regress/test_icu.cpp b/test/regress/test_icu.cpp index 39eda8a2..5dbc1cb6 100644 --- a/test/regress/test_icu.cpp +++ b/test/regress/test_icu.cpp @@ -20,10 +20,25 @@ // We can only build this if we have ICU support: // #include + +#ifdef __has_include +#if __has_include() +#define BOOST_HAS_ICU +#endif +#endif + #if defined(BOOST_HAS_ICU) && !defined(BOOST_NO_STD_WSTRING) #include +#ifndef BOOST_REGEX_STANDALONE #include +#else +#include +namespace boost { namespace mpl { + template + using int_ = ::std::integral_constant; +} } +#endif #include "test.hpp" namespace unnecessary_fix{ diff --git a/test/regress/test_mfc.cpp b/test/regress/test_mfc.cpp index 1dad08cf..2590f4f1 100644 --- a/test/regress/test_mfc.cpp +++ b/test/regress/test_mfc.cpp @@ -19,7 +19,7 @@ // // We can only build this if we have ATL support: // -#include +#include #ifdef TEST_MFC