Update build.jam, test/Jamfile

This reverts commit 9899acb4c9.

.drone.jsonnet

@@ -32,6 +32,8 @@ local linux_pipeline(name, image, environment, packages = "", sources = [], arch
             commands:
             [
                 'set -e',
+                'uname -a',
+                'echo $DRONE_STAGE_MACHINE',
                 'wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add -',
             ] +
             (if sources != [] then [ ('apt-add-repository "' + source + '"') for source in sources ] else []) +
@@ -186,6 +188,20 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
         "g++-12",
     ),
 
+    linux_pipeline(
+        "Linux 23.04 GCC 13",
+        "cppalliance/droneubuntu2304:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-13', CXXSTD: '03,11,14,17,20,2b' },
+        "g++-13",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 GCC 14",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'gcc', COMPILER: 'g++-14', CXXSTD: '03,11,14,17,20,2b' },
+        "g++-14",
+    ),
+
     linux_pipeline(
         "Linux 16.04 Clang 3.5",
         "cppalliance/droneubuntu1604:1",
@@ -303,7 +319,27 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
         "cppalliance/droneubuntu2204:1",
         { TOOLSET: 'clang', COMPILER: 'clang++-15', CXXSTD: '03,11,14,17,20,2b' },
         "clang-15",
-        ["deb http://apt.llvm.org/jammy/ llvm-toolchain-jammy-15 main"],
+    ),
+
+    linux_pipeline(
+        "Linux 23.04 Clang 16",
+        "cppalliance/droneubuntu2304:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-16', CXXSTD: '03,11,14,17,20,2b' },
+        "clang-16",
+    ),
+
+    linux_pipeline(
+        "Linux 23.10 Clang 17",
+        "cppalliance/droneubuntu2310:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-17', CXXSTD: '03,11,14,17,20,2b' },
+        "clang-17",
+    ),
+
+    linux_pipeline(
+        "Linux 24.04 Clang 18",
+        "cppalliance/droneubuntu2404:1",
+        { TOOLSET: 'clang', COMPILER: 'clang++-18', CXXSTD: '03,11,14,17,20,2b' },
+        "clang-18",
     ),
 
     macos_pipeline(
@@ -311,10 +347,16 @@ local windows_pipeline(name, image, environment, arch = "amd64") =
         { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,1z' },
     ),
 
+    macos_pipeline(
+        "MacOS 12.4 Xcode 13.4.1",
+        { TOOLSET: 'clang', COMPILER: 'clang++', CXXSTD: '03,11,14,17,20,2b' },
+        xcode_version = "13.4.1", osx_version = "monterey", arch = "arm64",
+    ),
+
     windows_pipeline(
         "Windows VS2015 msvc-14.0",
         "cppalliance/dronevs2015",
-        { TOOLSET: 'msvc-14.0', CXXSTD: '14,latest' },
+        { TOOLSET: 'msvc-14.0', CXXSTD: '14,latest', B2_DONT_EMBED_MANIFEST: '1' },
     ),
 
     windows_pipeline(

.drone/drone.sh

@@ -5,6 +5,7 @@
 # https://www.boost.org/LICENSE_1_0.txt
 
 set -ex
+export PATH=~/.local/bin:/usr/local/bin:$PATH
 
 DRONE_BUILD_DIR=$(pwd)
 

.github/workflows/ci.yml

@@ -54,6 +54,16 @@ jobs:
             cxxstd: "03,11,14,17,20,2b"
             os: ubuntu-22.04
             install: g++-12
+          - toolset: gcc-13
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-latest
+            container: ubuntu:23.04
+            install: g++-13
+          - toolset: gcc-14
+            cxxstd: "03,11,14,17,20,2b"
+            os: ubuntu-latest
+            container: ubuntu:24.04
+            install: g++-14
           - toolset: clang
             compiler: clang++-3.9
             cxxstd: "03,11,14"
@@ -110,24 +120,48 @@ jobs:
           - toolset: clang
             compiler: clang++-13
             cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
             install: clang-13
           - toolset: clang
             compiler: clang++-14
             cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
             install: clang-14
           - toolset: clang
             compiler: clang++-15
             cxxstd: "03,11,14,17,20,2b"
-            os: ubuntu-22.04
+            container: ubuntu:22.04
+            os: ubuntu-latest
             install: clang-15
           - toolset: clang
-            cxxstd: "03,11,14,17,2a"
-            os: macos-11
+            compiler: clang++-16
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:23.04
+            os: ubuntu-latest
+            install: clang-16
+          - toolset: clang
+            compiler: clang++-17
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:23.10
+            os: ubuntu-latest
+            install: clang-17
+          - toolset: clang
+            compiler: clang++-18
+            cxxstd: "03,11,14,17,20,2b"
+            container: ubuntu:24.04
+            os: ubuntu-latest
+            install: clang-18
           - toolset: clang
             cxxstd: "03,11,14,17,20,2b"
             os: macos-12
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,2b"
+            os: macos-13
+          - toolset: clang
+            cxxstd: "03,11,14,17,20,2b"
+            os: macos-14
 
     runs-on: ${{matrix.os}}
     container: ${{matrix.container}}
@@ -137,17 +171,23 @@ jobs:
         shell: bash
 
     steps:
+      - name: Enable Node 16
+        run: |
+          echo "ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION=true" >> $GITHUB_ENV
+
       - uses: actions/checkout@v3
 
       - name: Setup container environment
         if: matrix.container
         run: |
           apt-get update
-          apt-get -y install sudo python git g++
+          apt-get -y install sudo python3 git g++
 
       - name: Install packages
         if: matrix.install
-        run: sudo apt-get -y install ${{matrix.install}}
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install ${{matrix.install}}
 
       - name: Setup Boost
         run: |
@@ -168,7 +208,7 @@ jobs:
           mkdir -p libs/$LIBRARY
           cp -r $GITHUB_WORKSPACE/* libs/$LIBRARY
           git submodule update --init tools/boostdep
-          python tools/boostdep/depinst/depinst.py --git_args "--jobs 3" -I example $LIBRARY
+          python3 tools/boostdep/depinst/depinst.py --git_args "--jobs 3" -I example $LIBRARY
           ./bootstrap.sh
           ./b2 -d0 headers
 
@@ -221,7 +261,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Boost
         shell: cmd
@@ -259,13 +299,14 @@ jobs:
         include:
           - os: ubuntu-20.04
           - os: ubuntu-22.04
-          - os: macos-11
           - os: macos-12
+          - os: macos-13
+          - os: macos-14
 
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install packages
         if: matrix.install
@@ -306,13 +347,14 @@ jobs:
         include:
           - os: ubuntu-20.04
           - os: ubuntu-22.04
-          - os: macos-11
           - os: macos-12
+          - os: macos-13
+          - os: macos-14
 
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install packages
         if: matrix.install
@@ -363,13 +405,14 @@ jobs:
         include:
           - os: ubuntu-20.04
           - os: ubuntu-22.04
-          - os: macos-11
           - os: macos-12
+          - os: macos-13
+          - os: macos-14
 
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Install packages
         if: matrix.install
@@ -422,7 +465,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Boost
         shell: cmd
@@ -471,7 +514,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Boost
         shell: cmd
@@ -538,7 +581,7 @@ jobs:
     runs-on: ${{matrix.os}}
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
 
       - name: Setup Boost
         shell: cmd

build.jam

@@ -0,0 +1,20 @@
+# Copyright 2023-2024 René Ferdinand Rivera Morell
+# Copyright 2024 Peter Dimov
+# Distributed under the Boost Software License, Version 1.0.
+# https://www.boost.org/LICENSE_1_0.txt
+
+require-b2 5.2 ;
+
+constant boost_dependencies :
+    /boost/mp11//boost_mp11
+    ;
+
+project /boost/describe ;
+
+explicit
+    [ alias boost_describe : : : : <include>include <library>$(boost_dependencies) ]
+    [ alias all : boost_describe test ]
+    ;
+
+call-if : boost-library describe
+    ;

doc/describe/changes.adoc

@@ -8,6 +8,11 @@ https://www.boost.org/LICENSE_1_0.txt
 # Revision History
 :idprefix:
 
+## Changes in Boost 1.84.0
+
+* Added an overload of `enum_from_string` that takes a string view, to avoid
+  the need for null termination.
+
 ## Changes in Boost 1.81.0
 
 * To allow the inclusion of `enumerators.hpp`, `bases.hpp`, and `members.hpp`

doc/describe/reference.adoc

@@ -362,6 +362,7 @@ namespace boost {
 namespace describe {
 
 template<class E> bool enum_from_string( char const * name, E & e ) noexcept;
+template<class S, class E> bool enum_from_string( S const & name, E & e ) noexcept;
 
 } }
 ```
@@ -372,6 +373,11 @@ The function `enum_from_string` assigns to `e` the enumerator value correspondin
 to `name` and returns `true`. `E` must be a described enumeration type. If `name`
 does not correspond to one of the described values, the function returns `false`.
 
+The second overload only participates in overload resolution when `S` is a
+string-like type such as `std::string` or `std::string_view`. String-like types
+are recognized by the presence of nested `value_type` and `traits_type` typedefs
+and are expected to have a non-throwing `operator==` taking `char const*`.
+
 ## <boost/describe/operators.hpp>
 
 ```

example/fmtlib_class_formatter.cpp

@@ -18,7 +18,7 @@ template<class T> struct fmt::formatter<T, char, std::enable_if_t<
 
         if( it != end && *it != '}' )
         {
-            ctx.error_handler().on_error( "invalid format" );
+            throw_format_error( "invalid format" );
         }
 
         return it;

example/fmtlib_enum_formatter.cpp

@@ -25,7 +25,7 @@ public:
 
         if( i1 != i2 )
         {
-            ctx.error_handler().on_error( "invalid format" );
+            throw_format_error( "invalid format" );
         }
 
         return i1;

example/json_rpc.cpp

@@ -34,7 +34,7 @@ template<class C1, class C2, class R, class... A>
 
 template<class C>
   boost::json::value
-    call( C & c, boost::string_view method, boost::json::value const & args )
+    call( C & c, boost::string_view method, boost::json::array const & args )
 {
     using Fd = boost::describe::describe_members<C,
         boost::describe::mod_public | boost::describe::mod_function>;
@@ -46,7 +46,7 @@ template<class C>
 
         if( !found && method == D.name)
         {
-            result = call_impl( c, D.pointer, args.as_array() );
+            result = call_impl( c, D.pointer, args );
             found = true;
         }
 

include/boost/describe/enum_from_string.hpp

@@ -12,6 +12,7 @@
 #include <boost/describe/enumerators.hpp>
 #include <boost/mp11/algorithm.hpp>
 #include <cstring>
+#include <type_traits>
 
 #if defined(_MSC_VER) && _MSC_VER == 1900
 # pragma warning(push)
@@ -41,6 +42,29 @@ bool enum_from_string( char const* name, E& e ) noexcept
     return found;
 }
 
+template<class S, class E, class De = describe_enumerators<E>,
+    class En = std::enable_if_t<
+        std::is_same<typename S::value_type, char>::value &&
+        std::is_same<typename S::traits_type::char_type, char>::value
+    >
+>
+bool enum_from_string( S const& name, E& e ) noexcept
+{
+    bool found = false;
+
+    mp11::mp_for_each<De>([&](auto D){
+
+        if( !found && name == D.name )
+        {
+            found = true;
+            e = D.value;
+        }
+
+    });
+
+    return found;
+}
+
 } // namespace describe
 } // namespace boost
 

test/Jamfile

@@ -4,11 +4,16 @@
 
 import testing ;
 
+local WERROR = <toolset>msvc:<warnings-as-errors>on <toolset>clang:<warnings-as-errors>on <toolset>gcc:<warnings-as-errors>on ;
+
 project : requirements
+  <library>/boost/describe//boost_describe
+  <library>/boost/container_hash//boost_container_hash
+  <library>/boost/core//boost_core
+  <library>/boost/variant2//boost_variant2
+
   <warnings>extra
-  <toolset>msvc:<warnings-as-errors>on
-  <toolset>clang:<warnings-as-errors>on
-  <toolset>gcc:<warnings-as-errors>on
+  $(WERROR)
   <toolset>clang:<cxxflags>"-Wno-unused-private-field" ;
 
 run quick.cpp ;
@@ -78,6 +83,8 @@ run pedantic_bases_test.cpp
 run pedantic_members_test.cpp
   : : : <warnings>pedantic ;
 
+run enum_from_string_test2.cpp ;
+
 # examples
 
 obj describe_cxx14 : describe_cxx14.cpp ;
@@ -85,8 +92,8 @@ explicit describe_cxx14 ;
 
 local CXX14 = [ check-target-builds describe_cxx14 describe_cxx14 : : <build>no ] "<toolset>msvc-14.0:<cxxflags>-wd4100" ;
 
-local JSON = <library>/boost//json/<warnings>off "<toolset>msvc-14.2:<cxxflags>-wd5104" ;
-local SERIALIZATION = <library>/boost//serialization/<warnings>off "-<toolset>clang:<warnings-as-errors>on" ;
+local JSON = <library>/boost/json//boost_json/<warnings>off "<toolset>msvc-14.2:<cxxflags>-wd5104" ;
+local SERIALIZATION = <library>/boost/serialization//boost_serialization/<warnings>off -$(WERROR) ;
 
 run ../example/printing_enums_ct.cpp : : : $(CXX14) ;
 run ../example/printing_enums_rt.cpp : : : $(CXX14) ;
@@ -96,9 +103,10 @@ run ../example/print_function.cpp : : : $(CXX14) ;
 run ../example/to_json.cpp : : : $(CXX14) $(JSON) ;
 run ../example/from_json.cpp : : : $(CXX14) $(JSON) ;
 run ../example/serialization.cpp : : : $(CXX14) $(SERIALIZATION) ;
-run ../example/json_rpc.cpp : : : $(CXX14) $(JSON) ;
+run ../example/json_rpc.cpp : : : $(CXX14) $(JSON) <library>/boost/utility//boost_utility
+  "<toolset>gcc-14,<cxxstd>14:<build>no" ; # mysterious segmentation fault
 run ../example/hash_value.cpp : : : $(CXX14) ;
 run ../example/equality.cpp : : : $(CXX14) ;
-link ../example/console.cpp : $(CXX14) $(JSON) ;
+link ../example/console.cpp : $(CXX14) $(JSON) <library>/boost/utility//boost_utility ;
 run ../example/struct_to_tuple.cpp : : : $(CXX14) ;
 run ../example/pm_to_string.cpp : : : $(CXX14) ;

test/enum_from_string_test2.cpp

@@ -0,0 +1,78 @@
+// Copyright 2021 Peter Dimov
+// Distributed under the Boost Software License, Version 1.0.
+// https://www.boost.org/LICENSE_1_0.txt
+
+#include <boost/describe/enum_from_string.hpp>
+#include <boost/describe/enum.hpp>
+#include <boost/core/detail/string_view.hpp>
+#include <boost/core/lightweight_test.hpp>
+#include <boost/config.hpp>
+
+#if !defined(BOOST_DESCRIBE_CXX14)
+
+#include <boost/config/pragma_message.hpp>
+
+BOOST_PRAGMA_MESSAGE("Skipping test because C++14 is not available")
+int main() {}
+
+#else
+
+enum E1 { v101 = 101, v102 = 102 };
+BOOST_DESCRIBE_ENUM(E1, v101, v102)
+
+enum class E2 { v201 = 201, v202 = 202 };
+BOOST_DESCRIBE_ENUM(E2, v201, v202)
+
+BOOST_DEFINE_ENUM(E3, v301, v302)
+BOOST_DEFINE_ENUM_CLASS(E4, v401, v402)
+
+template<class St> void test()
+{
+    using boost::describe::enum_from_string;
+
+    {
+        E1 w{};
+        BOOST_TEST( enum_from_string( St( "v101" ), w ) ) && BOOST_TEST_EQ( w, v101 );
+        BOOST_TEST( enum_from_string( St( "v102" ), w ) ) && BOOST_TEST_EQ( w, v102 );
+        BOOST_TEST_NOT( enum_from_string( St( "v103" ), w ) );
+    }
+
+    {
+        E2 w{};
+        BOOST_TEST( enum_from_string( St( "v201" ), w ) ) && BOOST_TEST_EQ( (int)w, (int)E2::v201 );
+        BOOST_TEST( enum_from_string( St( "v202" ), w ) ) && BOOST_TEST_EQ( (int)w, (int)E2::v202 );
+        BOOST_TEST_NOT( enum_from_string( St( "v203" ), w ) );
+    }
+
+    {
+        E3 w{};
+        BOOST_TEST( enum_from_string( St( "v301" ), w ) ) && BOOST_TEST_EQ( w, v301 );
+        BOOST_TEST( enum_from_string( St( "v302" ), w ) ) && BOOST_TEST_EQ( w, v302 );
+        BOOST_TEST_NOT( enum_from_string( St( "v303" ), w ) );
+    }
+
+    {
+        E4 w{};
+        BOOST_TEST( enum_from_string( St( "v401" ), w ) ) && BOOST_TEST_EQ( (int)w, (int)E4::v401 );
+        BOOST_TEST( enum_from_string( St( "v402" ), w ) ) && BOOST_TEST_EQ( (int)w, (int)E4::v402 );
+        BOOST_TEST_NOT( enum_from_string( St( "v403" ), w ) );
+    }
+}
+
+#if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
+# include <string_view>
+#endif
+
+int main()
+{
+    test<std::string>();
+    test<boost::core::string_view>();
+
+#if !defined(BOOST_NO_CXX17_HDR_STRING_VIEW)
+    test<std::string_view>();
+#endif
+
+    return boost::report_errors();
+}
+
+#endif // !defined(BOOST_DESCRIBE_CXX14)