From b3e6d445cbf73da2b00062c3f639c2453041ee41 Mon Sep 17 00:00:00 2001 From: Jay Berkenbilt Date: Sun, 24 Jul 2022 15:42:23 -0400 Subject: Tweak "AndGet" mutator functions again Remove any ambiguity around whether old or new value is being returned. --- TODO | 43 ++++++++++++++++++++----------------------- 1 file changed, 20 insertions(+), 23 deletions(-) (limited to 'TODO') diff --git a/TODO b/TODO index 645b5d1f..25ca9ad7 100644 --- a/TODO +++ b/TODO @@ -8,29 +8,6 @@ Before Release: * Stay on top of https://github.com/pikepdf/pikepdf/pull/315 * Release qtest with updates to qtest-driver and copy back into qpdf -Parent pointer idea: - -* Have replaceKey, removeKey, and eraseItem return the old values. The - comments will clarify the difference between these and the andGet - versions. -* Add std::weak_ptr parent to QPDFObject. When adding a - direct object to an array or dictionary, set its parent. When - removing it, clear the parent pointer. -* When a direct object that already has a parent is added to - something, it is a warning and will become an error in qpdf 12. - There needs to be unsafe add methods used by unsafeShallowCopy. - These will add but not modify the parent pointer. - -This allows an object to be moved from one object to another by -removing it, which returns the now orphaned object, and then inserting -it somewhere else. It also doesn't break the pattern of adding a -direct object to something and subsequently mutating it. It just -prevents the same object from being added to more than one thing. - -Note that arrays and dictionaries still need to contain -QPDFObjectHandle because of indirect objects. This only pertains to -direct objects, which are always "resolved" in QPDFObjectHandle. - Next: * JSON v2 fixes @@ -70,6 +47,26 @@ Pending changes: about the case of more than 65,536 pages. If the top node has more than 256 children, we'll live with it. +Parent pointer idea: + +* Add std::weak_ptr parent to QPDFObject. When adding a + direct object to an array or dictionary, set its parent. When + removing it, clear the parent pointer. +* When a direct object that already has a parent is added to + something, it is a warning and will become an error in qpdf 12. + There needs to be unsafe add methods used by unsafeShallowCopy. + These will add but not modify the parent pointer. + +This allows an object to be moved from one object to another by +removing it, which returns the now orphaned object, and then inserting +it somewhere else. It also doesn't break the pattern of adding a +direct object to something and subsequently mutating it. It just +prevents the same object from being added to more than one thing. + +Note that arrays and dictionaries still need to contain +QPDFObjectHandle because of indirect objects. This only pertains to +direct objects, which are always "resolved" in QPDFObjectHandle. + Soon: Break ground on "Document-level work" -- cgit v1.2.3-54-g00ecf