Merge pull request #568 from BehaviorTree/v4.2

V4.2

Author: facontidavide

3rdparty/lexy/CMakeLists.txt

@@ -1,8 +1,8 @@
-# Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+# Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 # SPDX-License-Identifier: BSL-1.0
 
 cmake_minimum_required(VERSION 3.8)
-project(lexy VERSION 2022.12.0 LANGUAGES CXX)
+project(lexy VERSION 2022.12.1 LANGUAGES CXX)
 
 set(LEXY_USER_CONFIG_HEADER "" CACHE FILEPATH "The user config header for lexy.")
 option(LEXY_FORCE_CPP17     "Whether or not lexy should use C++17 even if compiler supports C++20." OFF)
@@ -46,7 +46,7 @@ if(CMAKE_CURRENT_SOURCE_DIR STREQUAL CMAKE_SOURCE_DIR)
         include(CMakePackageConfigHelpers)
         include(GNUInstallDirs)
 
-        install(TARGETS lexy_core lexy_file lexy_unicode lexy_ext _lexy_base lexy_dev
+        install(TARGETS lexy lexy_core lexy_file lexy_unicode lexy_ext _lexy_base lexy_dev
             EXPORT ${PROJECT_NAME}Targets
             RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}
             LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR}

3rdparty/lexy/cmake/lexyConfig.cmake.in

@@ -1,4 +1,4 @@
-# Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+# Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 # SPDX-License-Identifier: BSL-1.0
 
 # lexy CMake configuration file.

3rdparty/lexy/include/lexy/_detail/any_ref.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_ANY_REF_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/assert.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_ASSERT_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/buffer_builder.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_BUFFER_BUILDER_HPP_INCLUDED
@@ -38,7 +38,7 @@ class buffer_builder
             ::operator delete(_data);
     }
 
-    buffer_builder(const buffer_builder&) = delete;
+    buffer_builder(const buffer_builder&)            = delete;
     buffer_builder& operator=(const buffer_builder&) = delete;
 
     // The total capacity: read + write.

3rdparty/lexy/include/lexy/_detail/code_point.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_CODE_POINT_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/config.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_CONFIG_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/detect.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2021 Müller <jonathanmueller.dev@gmail.com>
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_DETECT_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/integer_sequence.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_INTEGER_SEQUENCE_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/invoke.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_INVOKE_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/iterator.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_ITERATOR_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/lazy_init.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_LAZY_INIT_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/memory_resource.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_MEMORY_RESOURCE_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/nttp_string.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_NTTP_STRING_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/stateless_lambda.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_STATELESS_LAMBDA_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/std.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_STD_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/string_view.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_STRING_VIEW_HPP_INCLUDED
@@ -197,7 +197,7 @@ struct _string_view_holder<FnPtr, index_sequence<Indices...>>
 };
 
 template <auto FnPtr>
-constexpr const auto* make_cstr = _string_view_holder<FnPtr>::value;
+inline constexpr const auto* make_cstr = _string_view_holder<FnPtr>::value;
 } // namespace lexy::_detail
 
 #endif // LEXY_DETAIL_STRING_VIEW_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/swar.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_SWAR_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/tuple.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_TUPLE_HPP_INCLUDED

3rdparty/lexy/include/lexy/_detail/type_name.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_DETAIL_TYPE_NAME_HPP_INCLUDED
@@ -79,8 +79,8 @@ template <typename T, int NsCount>
 constexpr string_view _type_name()
 {
     auto name = _full_type_name<T>();
-    LEXY_ASSERT(name.find('<') == string_view::npos || NsCount == 0,
-                "cannot strip namespaces from template instantiations");
+    if (name.find('<') != string_view::npos && NsCount != 0)
+        return name;
 
     for (auto namespace_count = NsCount; namespace_count > 0; --namespace_count)
     {
@@ -105,20 +105,25 @@ constexpr const char* type_name()
         return "unknown-type";
 }
 
-template <typename T>
-constexpr const void* type_id()
+template <typename T, int NsCount>
+inline constexpr const char* _type_id_holder = type_name<T, NsCount>();
+
+// Returns a unique address for each type.
+// For implementation reasons, it also doubles as the pointer to the name.
+template <typename T, int NsCount = 1>
+constexpr const char* const* type_id()
 {
-    // As different types have different type names, the compiler can't merge them,
-    // and we necessarily have different addresses.
-    if constexpr (_detail::is_detected<_detect_name_f, T>)
-        return T::name();
-    else if constexpr (_detail::is_detected<_detect_name_v, T>)
-        return T::name;
+    if constexpr (_detail::is_detected<_detect_name_v, T> //
+                  && !_detail::is_detected<_detect_name_f, T>)
+    {
+        // We can use the address of the static constexpr directly.
+        return &T::name;
+    }
     else
     {
-        static_assert(LEXY_HAS_AUTOMATIC_TYPE_NAME,
-                      "you need to manuall add a ::name() or ::name to your type");
-        return _full_type_name<T>().data();
+        // We instantiate a variable template with a function unique by type.
+        // As the variable is inline, there should be a single address only.
+        return &_type_id_holder<T, NsCount>;
     }
 }
 } // namespace lexy::_detail

3rdparty/lexy/include/lexy/action/base.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_BASE_HPP_INCLUDED

3rdparty/lexy/include/lexy/action/match.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_MATCH_HPP_INCLUDED

3rdparty/lexy/include/lexy/action/parse.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_PARSE_HPP_INCLUDED

3rdparty/lexy/include/lexy/action/parse_as_tree.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_PARSE_AS_TREE_HPP_INCLUDED

3rdparty/lexy/include/lexy/action/scan.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_SCAN_HPP_INCLUDED

3rdparty/lexy/include/lexy/action/trace.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_TRACE_HPP_INCLUDED

3rdparty/lexy/include/lexy/action/validate.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_ACTION_VALIDATE_HPP_INCLUDED
@@ -180,34 +180,45 @@ class _vh
     public:
         constexpr event_handler(production_info info) : _begin(), _info(info) {}
 
-        constexpr void on(_vh&, parse_events::production_start, iterator pos)
+        constexpr void on(_vh& handler, parse_events::production_start, iterator pos)
         {
             _begin = pos;
+
+            _prev        = handler._top;
+            handler._top = this;
+        }
+        constexpr void on(_vh& handler, parse_events::production_finish, iterator)
+        {
+            handler._top = _prev;
+        }
+        constexpr void on(_vh& handler, parse_events::production_cancel, iterator)
+        {
+            handler._top = _prev;
         }
 
         template <typename Tag>
         constexpr void on(_vh& handler, parse_events::error, const error<Reader, Tag>& error)
         {
-            handler._cb.generic(handler._cb.sink, _info, handler._cb.input, _begin, error);
+            handler._cb.generic(handler._cb.sink, get_info(), handler._cb.input, _begin, error);
         }
         constexpr void on(_vh& handler, parse_events::error, const error<Reader, void>& error)
         {
-            handler._cb.generic(handler._cb.sink, _info, handler._cb.input, _begin, error);
+            handler._cb.generic(handler._cb.sink, get_info(), handler._cb.input, _begin, error);
         }
         constexpr void on(_vh&                                   handler, parse_events::error,
                           const error<Reader, expected_literal>& error)
         {
-            handler._cb.literal(handler._cb.sink, _info, handler._cb.input, _begin, error);
+            handler._cb.literal(handler._cb.sink, get_info(), handler._cb.input, _begin, error);
         }
         constexpr void on(_vh&                                   handler, parse_events::error,
                           const error<Reader, expected_keyword>& error)
         {
-            handler._cb.keyword(handler._cb.sink, _info, handler._cb.input, _begin, error);
+            handler._cb.keyword(handler._cb.sink, get_info(), handler._cb.input, _begin, error);
         }
         constexpr void on(_vh&                                      handler, parse_events::error,
                           const error<Reader, expected_char_class>& error)
         {
-            handler._cb.char_class(handler._cb.sink, _info, handler._cb.input, _begin, error);
+            handler._cb.char_class(handler._cb.sink, get_info(), handler._cb.input, _begin, error);
         }
 
         template <typename Event, typename... Args>
@@ -223,12 +234,16 @@ class _vh
 
         constexpr production_info get_info() const
         {
-            return _info;
+            auto cur = this;
+            while (cur->_info.is_transparent && cur->_prev != nullptr)
+                cur = cur->_prev;
+            return cur->_info;
         }
 
     private:
         iterator        _begin;
         production_info _info;
+        event_handler*  _prev = nullptr;
     };
 
     template <typename Production, typename State>
@@ -243,6 +258,7 @@ class _vh
 
 private:
     _validate_callbacks<Reader> _cb;
+    event_handler*              _top = nullptr;
 };
 
 template <typename State, typename Input, typename ErrorCallback>

3rdparty/lexy/include/lexy/callback.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/adapter.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_ADAPTER_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/aggregate.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_AGGREGATE_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/base.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_BASE_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/bind.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_BIND_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/bit_cast.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_BIT_CAST_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/composition.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_COMPOSITION_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/constant.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_CONSTANT_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/container.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_CONTAINER_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/fold.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_FOLD_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/forward.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_FORWARD_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/integer.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_INTEGER_HPP_INCLUDED

3rdparty/lexy/include/lexy/callback/noop.hpp

@@ -1,4 +1,4 @@
-// Copyright (C) 2020-2022 Jonathan Müller and lexy contributors
+// Copyright (C) 2020-2023 Jonathan Müller and lexy contributors
 // SPDX-License-Identifier: BSL-1.0
 
 #ifndef LEXY_CALLBACK_NOOP_HPP_INCLUDED