mirror of
https://github.com/RGBCube/serenity
synced 2025-07-27 07:17:35 +00:00
LibPDF: Add more utility methods to {Dict,Array}Object
Being both of them containers, these classes already offered a set of methods to retrieve an inner element by key or index, respectively, with different methods for the different subtypes of the PDF::Object type returning the element cast to the correct type pointer. On top of that, DictObject offered an additional method to obtain an element as an Object pointer. While these methods were useful, they have some shortcomings: * They always take a Document pointer to first perform an object resolution, in case the element is a Reference. This is not always necessary though, as there are values that are always meant to be immediate, and hence the resolution lookup adds overhead. * There was no easy way to get an individual Object element from an ArrayObject like there is in DictObject. This makes it difficult to obtain such values, as one first needs to call dict.get() to get a Value, then cast it manually to a NonnullRefPtr<Object>. This commit fixes these two issues by: * Adding a new method that returns an Object for a given index. * Adding overloads for this new method, and all the existing methods described above, that do *not* take a Document, and therefore do *not* perform an object resolution lookup.
This commit is contained in:
parent
0e1c858f90
commit
8c79f0e0cf
2 changed files with 27 additions and 5 deletions
|
@ -82,8 +82,12 @@ public:
|
|||
ALWAYS_INLINE Value const& operator[](size_t index) const { return at(index); }
|
||||
ALWAYS_INLINE Value const& at(size_t index) const { return m_elements[index]; }
|
||||
|
||||
#define DEFINE_INDEXER(class_name, snake_name) \
|
||||
PDFErrorOr<NonnullRefPtr<class_name>> get_##snake_name##_at(Document*, size_t index) const;
|
||||
PDFErrorOr<NonnullRefPtr<Object>> get_object_at(Document* document, size_t index) const;
|
||||
NonnullRefPtr<Object> get_object_at(size_t index) const { return at(index).get<NonnullRefPtr<Object>>(); };
|
||||
|
||||
#define DEFINE_INDEXER(class_name, snake_name) \
|
||||
PDFErrorOr<NonnullRefPtr<class_name>> get_##snake_name##_at(Document*, size_t index) const; \
|
||||
NonnullRefPtr<class_name> get_##snake_name##_at(size_t index) const;
|
||||
ENUMERATE_OBJECT_TYPES(DEFINE_INDEXER)
|
||||
#undef DEFINE_INDEXER
|
||||
|
||||
|
@ -128,8 +132,9 @@ public:
|
|||
|
||||
PDFErrorOr<NonnullRefPtr<Object>> get_object(Document*, FlyString const& key) const;
|
||||
|
||||
#define DEFINE_GETTER(class_name, snake_name) \
|
||||
PDFErrorOr<NonnullRefPtr<class_name>> get_##snake_name(Document*, FlyString const& key) const;
|
||||
#define DEFINE_GETTER(class_name, snake_name) \
|
||||
PDFErrorOr<NonnullRefPtr<class_name>> get_##snake_name(Document*, FlyString const& key) const; \
|
||||
NonnullRefPtr<class_name> get_##snake_name(FlyString const& key) const;
|
||||
ENUMERATE_OBJECT_TYPES(DEFINE_GETTER)
|
||||
#undef DEFINE_GETTER
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue