Move QPDFObject::as to BaseHandle

m-holger
1 parent 8d7ed764
Showing 9 changed files with 61 additions and 91 deletions
include/qpdf/ObjectHandle.hh
include/qpdf/QPDF.hh
include/qpdf/QPDFObjectHandle.hh
libqpdf/QPDF.cc
libqpdf/QPDFObjectHandle.cc
libqpdf/QPDF_Array.cc
libqpdf/QPDF_Dictionary.cc
libqpdf/qpdf/QPDFObjectHandle_private.hh
libqpdf/qpdf/QPDFObject_private.hh
@@ -67,6 +67,9 @@ namespace qpdf
         BaseHandle& operator=(BaseHandle&&) = default;
         ~BaseHandle() = default;
+        template <typename T>
+        T* as() const;
+
         std::shared_ptr<QPDFObject> obj;
     };
@@ -798,9 +798,10 @@ class QPDF
     {
         friend class QPDFObject;
         friend class QPDF_Unresolved;
+        friend class qpdf::BaseHandle;
       private:
-        static QPDFObject*
+        static std::shared_ptr<QPDFObject> const&
         resolved(QPDF* qpdf, QPDFObjGen og)
         {
             return qpdf->resolve(og);
@@ -1072,7 +1073,7 @@ class QPDF
         QPDFObjGen exp_og,
         QPDFObjGen& og,
         bool skip_cache_if_in_xref);
-    QPDFObject* resolve(QPDFObjGen og);
+    std::shared_ptr<QPDFObject> const& resolve(QPDFObjGen og);
     void resolveObjectsInStream(int obj_stream_number);
     void stopOnError(std::string const& message);
     QPDFObjGen nextObjGen();
@@ -1359,20 +1359,6 @@ class QPDFObjectHandle final: public qpdf::BaseHandle
     inline qpdf::Stream as_stream(qpdf::typed options = qpdf::typed::strict) const;
   private:
-    QPDF_Array* asArray() const;
-    QPDF_Bool* asBool() const;
-    QPDF_Dictionary* asDictionary() const;
-    QPDF_InlineImage* asInlineImage() const;
-    QPDF_Integer* asInteger() const;
-    QPDF_Name* asName() const;
-    QPDF_Null* asNull() const;
-    QPDF_Operator* asOperator() const;
-    QPDF_Real* asReal() const;
-    QPDF_Reserved* asReserved() const;
-    QPDF_Stream* asStream() const;
-    QPDF_Stream* asStreamWithAssert() const;
-    QPDF_String* asString() const;
-
     void typeWarning(char const* expected_type, std::string const& warning) const;
     void objectWarning(std::string const& warning) const;
     void assertType(char const* type_name, bool istype) const;
@@ -1867,11 +1867,11 @@ QPDF::readObjectAtOffset(
     return oh;
 }
-QPDFObject*
+std::shared_ptr<QPDFObject> const&
 QPDF::resolve(QPDFObjGen og)
 {
     if (!isUnresolved(og)) {
-        return m->obj_cache[og].object.get();
+        return m->obj_cache[og].object;
     }
     if (m->resolving.count(og)) {
@@ -1880,7 +1880,7 @@ QPDF::resolve(QPDFObjGen og)
         QTC::TC("qpdf", "QPDF recursion loop in resolve");
         warn(damagedPDF("", "loop detected resolving object " + og.unparse(' ')));
         updateCache(og, QPDFObject::create<QPDF_Null>(), -1, -1);
-        return m->obj_cache[og].object.get();
+        return m->obj_cache[og].object;
     }
     ResolveRecorder rr(this, og);
@@ -1919,9 +1919,9 @@ QPDF::resolve(QPDFObjGen og)
         updateCache(og, QPDFObject::create<QPDF_Null>(), -1, -1);
     }
-    auto result(m->obj_cache[og].object);
+    auto& result(m->obj_cache[og].object);
     result->setDefaultDescription(this, og);
-    return result.get();
+    return result;
 }
 void
@@ -697,24 +697,6 @@ QPDFObjectHandle::getTypeName() const
     return obj ? tn[getTypeCode()] : "uninitialized";
 }
-QPDF_Bool*
-QPDFObjectHandle::asBool() const
-{
-    return obj ? obj->as<QPDF_Bool>() : nullptr;
-}
-
-QPDF_Integer*
-QPDFObjectHandle::asInteger() const
-{
-    return obj ? obj->as<QPDF_Integer>() : nullptr;
-}
-
-QPDF_String*
-QPDFObjectHandle::asString() const
-{
-    return obj ? obj->as<QPDF_String>() : nullptr;
-}
-
 bool
 QPDFObjectHandle::isDestroyed() const
 {
@@ -861,8 +843,7 @@ QPDFObjectHandle::isStreamOfType(std::string const&amp; type, std::string const&amp; sub
 bool
 QPDFObjectHandle::getBoolValue() const
 {
-    auto boolean = asBool();
-    if (boolean) {
+    if (auto boolean = as<QPDF_Bool>()) {
         return boolean->val;
     } else {
         typeWarning("boolean", "returning false");
@@ -874,12 +855,11 @@ QPDFObjectHandle::getBoolValue() const
 bool
 QPDFObjectHandle::getValueAsBool(bool& value) const
 {
-    auto boolean = asBool();
-    if (boolean == nullptr) {
-        return false;
+    if (auto boolean = as<QPDF_Bool>()) {
+        value = boolean->val;
+        return true;
     }
-    value = boolean->val;
-    return true;
+    return false;
 }
 // Integer accessors
@@ -887,8 +867,7 @@ QPDFObjectHandle::getValueAsBool(bool&amp; value) const
 long long
 QPDFObjectHandle::getIntValue() const
 {
-    auto integer = asInteger();
-    if (integer) {
+    if (auto integer = as<QPDF_Integer>()) {
         return integer->val;
     } else {
         typeWarning("integer", "returning 0");
@@ -900,12 +879,11 @@ QPDFObjectHandle::getIntValue() const
 bool
 QPDFObjectHandle::getValueAsInt(long long& value) const
 {
-    auto integer = asInteger();
-    if (integer == nullptr) {
-        return false;
+    if (auto integer = as<QPDF_Integer>()) {
+        value = integer->val;
+        return true;
     }
-    value = integer->val;
-    return true;
+    return false;
 }
 int
@@ -1062,8 +1040,7 @@ QPDFObjectHandle::getValueAsString(std::string&amp; value) const
 std::string
 QPDFObjectHandle::getUTF8Value() const
 {
-    auto str = asString();
-    if (str) {
+    if (auto str = as<QPDF_String>()) {
         return str->getUTF8Val();
     } else {
         typeWarning("string", "returning empty string");
@@ -1075,12 +1052,11 @@ QPDFObjectHandle::getUTF8Value() const
 bool
 QPDFObjectHandle::getValueAsUTF8(std::string& value) const
 {
-    auto str = asString();
-    if (str == nullptr) {
-        return false;
+    if (auto str = as<QPDF_String>()) {
+        value = str->getUTF8Val();
+        return true;
     }
-    value = str->getUTF8Val();
-    return true;
+    return false;
 }
 // Operator and Inline Image accessors
@@ -1487,7 +1463,7 @@ QPDFObjectHandle::unparseResolved() const
 std::string
 QPDFObjectHandle::unparseBinary() const
 {
-    if (auto str = asString()) {
+    if (auto str = as<QPDF_String>()) {
         return str->unparse(true);
     } else {
         return unparse();
@@ -59,11 +59,10 @@ QPDF_Array::QPDF_Array(std::vector&lt;std::shared_ptr&lt;QPDFObject&gt;&gt;&amp;&amp; v, bool sparse
 QPDF_Array*
 Array::array() const
 {
-    if (obj) {
-        if (auto a = obj->as<QPDF_Array>()) {
-            return a;
-        }
+    if (auto a = as<QPDF_Array>()) {
+        return a;
     }
+
     throw std::runtime_error("Expected an array but found a non-array object");
     return nullptr; // unreachable
 }
@@ -9,10 +9,8 @@ using namespace qpdf;
 QPDF_Dictionary*
 BaseDictionary::dict() const
 {
-    if (obj) {
-        if (auto d = obj->as<QPDF_Dictionary>()) {
-            return d;
-        }
+    if (auto d = as<QPDF_Dictionary>()) {
+        return d;
     }
     throw std::runtime_error("Expected a dictionary but found a non-dictionary object");
     return nullptr; // unreachable
@@ -204,12 +204,13 @@ namespace qpdf
         QPDF_Stream::Members*
         stream() const
         {
-            if (obj) {
-                if (auto s = obj->as<QPDF_Stream>()) {
-                    return s->m.get();
+            if (auto s = as<QPDF_Stream>()) {
+                if (auto ptr = s->m.get()) {
+                    return ptr;
                 }
+                throw std::logic_error("QPDF_Stream: unexpected nullptr");
             }
-            throw std::runtime_error("operation for stream attempted on object of type dictionary");
+            throw std::runtime_error("operation for stream attempted on non-stream object");
             return nullptr; // unreachable
         }
         bool filterable(
@@ -226,6 +227,26 @@ namespace qpdf
             filter_factories;
     };
+    template <typename T>
+    T*
+    BaseHandle::as() const
+    {
+        if (!obj) {
+            return nullptr;
+        }
+        if (std::holds_alternative<T>(obj->value)) {
+            return &std::get<T>(obj->value);
+        }
+        if (std::holds_alternative<QPDF_Unresolved>(obj->value)) {
+            return BaseHandle(QPDF::Resolver::resolved(obj->qpdf, obj->og)).as<T>();
+        }
+        if (std::holds_alternative<QPDF_Reference>(obj->value)) {
+            // see comment in QPDF_Reference.
+            return BaseHandle(std::get<QPDF_Reference>(obj->value).obj).as<T>();
+        }
+        return nullptr;
+    }
+
     inline qpdf_object_type_e
     BaseHandle::type_code() const
     {
@@ -172,6 +172,7 @@ class QPDF_Reference
     // objects that are an indirect reference we will need to support multiple levels of
     // indirection, including the possibility of circular references.
     friend class QPDFObject;
+    friend class qpdf::BaseHandle;
     QPDF_Reference(std::shared_ptr<QPDFObject> obj) :
         obj(std::move(obj))
@@ -366,7 +367,7 @@ class QPDFObject
     const QPDFObject*
     resolved_object() const
     {
-        return isUnresolved() ? QPDF::Resolver::resolved(qpdf, og) : this;
+        return isUnresolved() ? QPDF::Resolver::resolved(qpdf, og).get() : this;
     }
     struct JSON_Descr
@@ -461,25 +462,10 @@ class QPDFObject
         return og;
     }
-    template <typename T>
-    T*
-    as()
-    {
-        if (std::holds_alternative<T>(value)) {
-            return &std::get<T>(value);
-        }
-        if (std::holds_alternative<QPDF_Unresolved>(value)) {
-            return QPDF::Resolver::resolved(qpdf, og)->as<T>();
-        }
-        if (std::holds_alternative<QPDF_Reference>(value)) {
-            // see comment in QPDF_Reference.
-            return std::get<QPDF_Reference>(value).obj->as<T>();
-        }
-        return nullptr;
-    }
-
   private:
     friend class QPDF_Stream;
+    friend class qpdf::BaseHandle;
+
     typedef std::variant<
         std::monostate,
         QPDF_Reserved,