From bcfdfec8bac88f0461a90a35c045dd7c3bef34c8 Mon Sep 17 00:00:00 2001
From: Chris Fretz <cfretz@icloud.com>
Date: Sun, 1 Mar 2020 01:28:48 -0500
Subject: [PATCH] Fixed an overload constraint issue in dart::object

---
 include/dart.h              | 93 +++++++++++++++++++++++++++++++++++--
 include/dart/api.tcc        |  5 ++
 include/dart/buffer/api.tcc |  5 ++
 include/dart/heap/api.tcc   |  5 ++
 include/dart/object.tcc     | 18 +++++++
 include/dart/packet/api.tcc | 20 ++++++++
 6 files changed, 142 insertions(+), 4 deletions(-)

diff --git a/include/dart.h b/include/dart.h
index b688cec..946aad8 100644
--- a/include/dart.h
+++ b/include/dart.h
@@ -231,6 +231,24 @@ namespace dart {
       >
       explicit basic_object(Arg&& arg);
 
+      /**
+       *  @brief
+       *  Constructor allows an existing packet instance to be wrapped
+       *  under the strongly typed API.
+       *
+       *  @details
+       *  If the passed packet is not an object, will throw an exception.
+       */
+      template <class Arg,
+        std::enable_if_t<
+          std::is_same<
+            std::decay_t<Arg>,
+            Object
+          >::value
+        >* EnableIf = nullptr
+      >
+      explicit basic_object(Arg&& arg);
+
       /**
        *  @brief
        *  Function is responsible for forwarding any constructors
@@ -258,6 +276,11 @@ namespace dart {
             Arg,
             Object
           >::value
+          &&
+          !std::is_same<
+            std::decay_t<Arg>,
+            Object
+          >::value
         >* EnableIf = nullptr
       >
       basic_object(Arg&& arg);
@@ -4781,6 +4804,16 @@ namespace dart {
       >
       explicit basic_null(basic_null<N> const&) {}
 
+      /**
+       *  @brief
+       *  Constructor allows an existing packet instance to be wrapped
+       *  under the strongly typed API.
+       *
+       *  @details
+       *  If the passed packet is not a null, will throw an exception.
+       */
+      explicit basic_null(Null const& null);
+
       /**
        *  @brief
        *  Converting constructor to allow interoperability between underlying
@@ -5434,13 +5467,21 @@ namespace dart {
       operator view() const& noexcept;
       operator view() && = delete;
 
+      /**
+       *  @brief
+       *  Conversion operator to finalized type
+       */
+      explicit operator basic_buffer<RefCount>() const;
+
       /**
        *  @brief
        *  Generic conversion operator.
        */
       template <class T, class EnableIf =
         std::enable_if_t<
-          !meta::is_higher_specialization_of<T, basic_packet>::value
+          !detail::is_dart_type<T>::value
+          &&
+          !detail::is_wrapper_type<T>::value
           &&
           convert::is_castable<basic_heap, T>::value
         >
@@ -5453,7 +5494,9 @@ namespace dart {
        */
       template <class T, class EnableIf =
         std::enable_if_t<
-          !meta::is_higher_specialization_of<T, basic_packet>::value
+          !detail::is_dart_type<T>::value
+          &&
+          !detail::is_wrapper_type<T>::value
           &&
           convert::is_castable<basic_heap, T>::value
         >
@@ -8270,13 +8313,21 @@ namespace dart {
       operator view() const& noexcept;
       operator view() && = delete;
 
+      /**
+       *  @brief
+       *  Explicit conversion to non-finalized type
+       */
+      explicit operator basic_heap<RefCount>() const;
+
       /**
        *  @brief
        *  Generic conversion operator.
        */
       template <class T, class EnableIf =
         std::enable_if_t<
-          !meta::is_higher_specialization_of<T, basic_packet>::value
+          !detail::is_dart_type<T>::value
+          &&
+          !detail::is_wrapper_type<T>::value
           &&
           convert::is_castable<basic_buffer, T>::value
         >
@@ -8289,7 +8340,9 @@ namespace dart {
        */
       template <class T, class EnableIf =
         std::enable_if_t<
-          !meta::is_higher_specialization_of<T, basic_packet>::value
+          !detail::is_dart_type<T>::value
+          &&
+          !detail::is_wrapper_type<T>::value
           &&
           convert::is_castable<basic_buffer, T>::value
         >
@@ -10613,12 +10666,40 @@ namespace dart {
       operator view() const& noexcept;
       operator view() && = delete;
 
+      /**
+       *  @brief
+       *  Explicit conversion to non-finalized API.
+       */
+      explicit operator basic_heap<RefCount>() const&;
+
+      /**
+       *  @brief
+       *  Explicit conversion to non-finalized API.
+       */
+      explicit operator basic_heap<RefCount>() &&;
+
+      /**
+       *  @brief
+       *  Explicit conversion to finalized API.
+       */
+      explicit operator basic_buffer<RefCount>() const&;
+
+      /**
+       *  @brief
+       *  Explicit conversion to non-finalized API.
+       */
+      explicit operator basic_buffer<RefCount>() &&;
+
       /**
        *  @brief
        *  Generic conversion operator.
        */
       template <class T, class EnableIf =
         std::enable_if_t<
+          !detail::is_dart_type<T>::value
+          &&
+          !detail::is_wrapper_type<T>::value
+          &&
           convert::is_castable<basic_packet, T>::value
         >
       >
@@ -10630,6 +10711,10 @@ namespace dart {
        */
       template <class T, class EnableIf =
         std::enable_if_t<
+          !detail::is_dart_type<T>::value
+          &&
+          !detail::is_wrapper_type<T>::value
+          &&
           convert::is_castable<basic_packet, T>::value
         >
       >
diff --git a/include/dart/api.tcc b/include/dart/api.tcc
index b9abf53..a64188e 100644
--- a/include/dart/api.tcc
+++ b/include/dart/api.tcc
@@ -13,6 +13,11 @@
 
 namespace dart {
 
+  template <class Null>
+  basic_null<Null>::basic_null(Null const& null) {
+    if (!null.is_null()) throw type_error("dart::packet::null can only be constructed as a null");
+  }
+
   template <class Object>
   template <class Key, class Value, class Comp, class Alloc, class EnableIf>
   basic_object<Object>& basic_object<Object>::operator =(std::map<Key, Value, Comp, Alloc> const& map) & {
diff --git a/include/dart/buffer/api.tcc b/include/dart/buffer/api.tcc
index 52cf870..b116352 100644
--- a/include/dart/buffer/api.tcc
+++ b/include/dart/buffer/api.tcc
@@ -60,6 +60,11 @@ namespace dart {
     return tmp;
   }
 
+  template <template <class> class RefCount>
+  basic_buffer<RefCount>::operator basic_heap<RefCount>() const {
+    return convert::cast<basic_heap<RefCount>>(*this);
+  }
+
   template <template <class> class RefCount>
   template <class T, class EnableIf>
   basic_buffer<RefCount>::operator T() const& {
diff --git a/include/dart/heap/api.tcc b/include/dart/heap/api.tcc
index 7477cfe..6c3d056 100644
--- a/include/dart/heap/api.tcc
+++ b/include/dart/heap/api.tcc
@@ -53,6 +53,11 @@ namespace dart {
     return view {detail::view_tag {}, data};
   }
 
+  template <template <class> class RefCount>
+  basic_heap<RefCount>::operator basic_buffer<RefCount>() const {
+    return convert::cast<basic_buffer<RefCount>>(*this);
+  }
+
   template <template <class> class RefCount>
   template <class T, class EnableIf>
   basic_heap<RefCount>::operator T() const& {
diff --git a/include/dart/object.tcc b/include/dart/object.tcc
index 61643ed..8c010e0 100644
--- a/include/dart/object.tcc
+++ b/include/dart/object.tcc
@@ -32,6 +32,19 @@ namespace dart {
     ensure_object("dart::packet::object can only be constructed as an object");
   }
 
+  template <class Object>
+  template <class Arg,
+    std::enable_if_t<
+      std::is_same<
+        std::decay_t<Arg>,
+        Object
+      >::value
+    >* EnableIf
+  >
+  basic_object<Object>::basic_object(Arg&& arg) : val(std::forward<Arg>(arg)) {
+    ensure_object("dart::packet::object can only be constructed as an object");
+  }
+
   template <class Object>
   template <class Arg,
     std::enable_if_t<
@@ -43,6 +56,11 @@ namespace dart {
         Arg,
         Object
       >::value
+      &&
+      !std::is_same<
+        std::decay_t<Arg>,
+        Object
+      >::value
     >* EnableIf
   >
   basic_object<Object>::basic_object(Arg&& arg) : val(std::forward<Arg>(arg)) {
diff --git a/include/dart/packet/api.tcc b/include/dart/packet/api.tcc
index 54201d9..4da9a82 100644
--- a/include/dart/packet/api.tcc
+++ b/include/dart/packet/api.tcc
@@ -45,6 +45,26 @@ namespace dart {
     }, impl);
   }
 
+  template <template <class> class RefCount>
+  basic_packet<RefCount>::operator basic_heap<RefCount>() const& {
+    return convert::cast<basic_heap<RefCount>>(*this);
+  }
+
+  template <template <class> class RefCount>
+  basic_packet<RefCount>::operator basic_heap<RefCount>() && {
+    return convert::cast<basic_heap<RefCount>>(std::move(*this));
+  }
+
+  template <template <class> class RefCount>
+  basic_packet<RefCount>::operator basic_buffer<RefCount>() const& {
+    return convert::cast<basic_buffer<RefCount>>(*this);
+  }
+
+  template <template <class> class RefCount>
+  basic_packet<RefCount>::operator basic_buffer<RefCount>() && {
+    return convert::cast<basic_buffer<RefCount>>(std::move(*this));
+  }
+
   template <template <class> class RefCount>
   template <class T, class EnableIf>
   basic_packet<RefCount>::operator T() const& {