Add move and copy operations to `BaseHandle` and `Array` private API classes, st…

…reamline object assignment, and introduce constructors for `QPDFObjectHandle`.

Add move and copy operations to `BaseHandle` and `Array` private API classes, st…
…reamline object assignment, and introduce constructors for `QPDFObjectHandle`.
m-holger
1 parent 1174cd2c
Showing 3 changed files with 96 additions and 0 deletions
include/qpdf/ObjectHandle.hh
libqpdf/QPDF_Array.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
@@ -104,11 +104,18 @@ namespace qpdf
         BaseHandle& operator=(BaseHandle const&) = default;
         BaseHandle(BaseHandle&&) = default;
         BaseHandle& operator=(BaseHandle&&) = default;
+
+        inline BaseHandle(QPDFObjectHandle const& oh);
+        inline BaseHandle(QPDFObjectHandle&& oh);
+
         ~BaseHandle() = default;
         template <typename T>
         T* as() const;
+        inline void assign(qpdf_object_type_e required, BaseHandle const& other);
+        inline void assign(qpdf_object_type_e required, BaseHandle&& other);
+
         std::string description() const;
         std::runtime_error type_error(char const* expected_type) const;
         QPDFExc type_error(char const* expected_type, std::string const& message) const;
@@ -60,6 +60,21 @@ Array::array() const
     return nullptr; // unreachable
 }
+Array::Array(bool empty) :
+    BaseHandle(empty ? QPDFObject::create<QPDF_Array>() : nullptr)
+{
+}
+
+Array::Array(std::vector<QPDFObjectHandle> const& items) :
+    BaseHandle(QPDFObject::create<QPDF_Array>(items))
+{
+}
+
+Array::Array(std::vector<QPDFObjectHandle>&& items) :
+    BaseHandle(QPDFObject::create<QPDF_Array>(std::move(items)))
+{
+}
+
 Array::iterator
 Array::begin()
 {
@@ -12,6 +12,30 @@ namespace qpdf
     class Array final: public BaseHandle
     {
       public:
+        // Create an empty Array. If 'empty' is false, create a null Array.
+        Array(bool empty = true);
+
+        Array(std::vector<QPDFObjectHandle> const& items);
+
+        Array(std::vector<QPDFObjectHandle>&& items);
+
+        Array(Array const& other) :
+            BaseHandle(other.obj)
+        {
+        }
+
+        Array&
+        operator=(Array const& other)
+        {
+            if (obj != other.obj) {
+                obj = other.obj;
+            }
+            return *this;
+        }
+
+        Array(Array&&) = default;
+        Array& operator=(Array&&) = default;
+
         explicit Array(std::shared_ptr<QPDFObject> const& obj) :
             BaseHandle(obj)
         {
@@ -22,6 +46,30 @@ namespace qpdf
         {
         }
+        Array(QPDFObjectHandle const& oh) :
+            BaseHandle(oh.resolved_type_code() == ::ot_array ? oh : QPDFObjectHandle())
+        {
+        }
+
+        Array&
+        operator=(QPDFObjectHandle const& oh)
+        {
+            assign(::ot_array, oh);
+            return *this;
+        }
+
+        Array(QPDFObjectHandle&& oh) :
+            BaseHandle(oh.resolved_type_code() == ::ot_array ? std::move(oh) : QPDFObjectHandle())
+        {
+        }
+
+        Array&
+        operator=(QPDFObjectHandle&& oh)
+        {
+            assign(::ot_array, std::move(oh));
+            return *this;
+        }
+
         using iterator = std::vector<QPDFObjectHandle>::iterator;
         using const_iterator = std::vector<QPDFObjectHandle>::const_iterator;
         using const_reverse_iterator = std::vector<QPDFObjectHandle>::const_reverse_iterator;
@@ -342,6 +390,32 @@ namespace qpdf
         return nullptr;
     }
+    inline BaseHandle::BaseHandle(QPDFObjectHandle const& oh) :
+        obj(oh.obj)
+    {
+    }
+
+    inline BaseHandle::BaseHandle(QPDFObjectHandle&& oh) :
+        obj(std::move(oh.obj))
+    {
+    }
+
+    inline void
+    BaseHandle::assign(qpdf_object_type_e required, BaseHandle const& other)
+    {
+        if (obj != other.obj) {
+            obj = other.resolved_type_code() == required ? other.obj : nullptr;
+        }
+    }
+
+    inline void
+    BaseHandle::assign(qpdf_object_type_e required, BaseHandle&& other)
+    {
+        if (obj != other.obj) {
+            obj = other.resolved_type_code() == required ? std::move(other.obj) : nullptr;
+        }
+    }
+
     inline QPDFObjGen
     BaseHandle::id_gen() const
     {