From 8ba551bb1cd6a57e27b941ddb2cd43a7703e154a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 4 Apr 2026 17:30:03 -0400 Subject: [PATCH] refactor: retire GCObject.shallow_size() Not needed. Rely on size stored in gc-owned object header --- .../xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp | 2 -- include/xo/interpreter2/detail/IGCObject_DClosure.hpp | 2 -- .../interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp | 2 -- include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp | 2 -- .../xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp | 2 -- include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp | 2 -- .../interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp | 2 -- .../xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp | 2 -- .../vsm/IGCObject_DVirtualSchematikaMachine.hpp | 2 -- src/interpreter2/IGCObject_DClosure.cpp | 6 ------ src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp | 6 ------ src/interpreter2/IGCObject_DVsmApplyFrame.cpp | 6 ------ src/interpreter2/IGCObject_DVsmDefContFrame.cpp | 6 ------ src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp | 6 ------ src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp | 6 ------ src/interpreter2/IGCObject_DVsmSeqContFrame.cpp | 6 ------ src/interpreter2/facet/IGCObject_DLocalEnv.cpp | 6 ------ .../facet/IGCObject_DVirtualSchematikaMachine.cpp | 6 ------ 18 files changed, 72 deletions(-) diff --git a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp index 131d57ae..7d082c38 100644 --- a/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp +++ b/include/xo/interpreter2/define/IGCObject_DVsmDefContFrame.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvsmdefcontframe-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVsmDefContFrame & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp index c0d7d22b..84502baa 100644 --- a/include/xo/interpreter2/detail/IGCObject_DClosure.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DClosure.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dclosure-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DClosure & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp index 2a2e9034..9a2e478d 100644 --- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyClosureFrame.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvsmapplyclosureframe-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVsmApplyClosureFrame & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp index 83d88686..9de1e8f3 100644 --- a/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DVsmApplyFrame.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvsmapplyframe-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVsmApplyFrame & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp index cd53aa9d..9e2841a6 100644 --- a/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp +++ b/include/xo/interpreter2/detail/IGCObject_DVsmEvalArgsFrame.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvsmevalargsframe-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVsmEvalArgsFrame & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp index 8576aeda..e4de912e 100644 --- a/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp +++ b/include/xo/interpreter2/env/IGCObject_DLocalEnv.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dlocalenv-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DLocalEnv & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp index 18297357..a3cede47 100644 --- a/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp +++ b/include/xo/interpreter2/ifelse/IGCObject_DVsmIfElseContFrame.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvsmifelsecontframe-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVsmIfElseContFrame & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp index ca457e3d..14367b50 100644 --- a/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp +++ b/include/xo/interpreter2/sequence/IGCObject_DVsmSeqContFrame.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvsmseqcontframe-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVsmSeqContFrame & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp b/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp index 0a51165e..073e9fac 100644 --- a/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp +++ b/include/xo/interpreter2/vsm/IGCObject_DVirtualSchematikaMachine.hpp @@ -50,8 +50,6 @@ namespace xo { /** @defgroup scm-gcobject-dvirtualschematikamachine-methods **/ ///@{ // const methods - /** memory consumption for this instance **/ - static size_type shallow_size(const DVirtualSchematikaMachine & self) noexcept; // non-const methods /** move instance using allocator **/ diff --git a/src/interpreter2/IGCObject_DClosure.cpp b/src/interpreter2/IGCObject_DClosure.cpp index ac9f1932..3f6af457 100644 --- a/src/interpreter2/IGCObject_DClosure.cpp +++ b/src/interpreter2/IGCObject_DClosure.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DClosure::shallow_size(const DClosure & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DClosure::shallow_move(DClosure & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp b/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp index 2904c6be..cd0bed84 100644 --- a/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmApplyClosureFrame.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVsmApplyClosureFrame::shallow_size(const DVsmApplyClosureFrame & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVsmApplyClosureFrame::shallow_move(DVsmApplyClosureFrame & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/IGCObject_DVsmApplyFrame.cpp b/src/interpreter2/IGCObject_DVsmApplyFrame.cpp index c8701e58..0024df69 100644 --- a/src/interpreter2/IGCObject_DVsmApplyFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmApplyFrame.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVsmApplyFrame::shallow_size(const DVsmApplyFrame & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVsmApplyFrame::shallow_move(DVsmApplyFrame & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/IGCObject_DVsmDefContFrame.cpp b/src/interpreter2/IGCObject_DVsmDefContFrame.cpp index a574c84f..e0cc2158 100644 --- a/src/interpreter2/IGCObject_DVsmDefContFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmDefContFrame.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVsmDefContFrame::shallow_size(const DVsmDefContFrame & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVsmDefContFrame::shallow_move(DVsmDefContFrame & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp b/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp index 072f0e49..8107e7d9 100644 --- a/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmEvalArgsFrame.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVsmEvalArgsFrame::shallow_size(const DVsmEvalArgsFrame & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVsmEvalArgsFrame::shallow_move(DVsmEvalArgsFrame & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp b/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp index 842199da..7b95a521 100644 --- a/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmIfElseContFrame.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVsmIfElseContFrame::shallow_size(const DVsmIfElseContFrame & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVsmIfElseContFrame::shallow_move(DVsmIfElseContFrame & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp b/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp index fb504b96..c9651507 100644 --- a/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp +++ b/src/interpreter2/IGCObject_DVsmSeqContFrame.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVsmSeqContFrame::shallow_size(const DVsmSeqContFrame & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVsmSeqContFrame::shallow_move(DVsmSeqContFrame & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/facet/IGCObject_DLocalEnv.cpp b/src/interpreter2/facet/IGCObject_DLocalEnv.cpp index dfa0cc30..25b84b4e 100644 --- a/src/interpreter2/facet/IGCObject_DLocalEnv.cpp +++ b/src/interpreter2/facet/IGCObject_DLocalEnv.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DLocalEnv::shallow_size(const DLocalEnv & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DLocalEnv::shallow_move(DLocalEnv & self, obj gc) noexcept -> Opaque { diff --git a/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp b/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp index 97168084..8f071003 100644 --- a/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp +++ b/src/interpreter2/facet/IGCObject_DVirtualSchematikaMachine.cpp @@ -15,12 +15,6 @@ namespace xo { namespace scm { - auto - IGCObject_DVirtualSchematikaMachine::shallow_size(const DVirtualSchematikaMachine & self) noexcept -> size_type - { - return self.shallow_size(); - } - auto IGCObject_DVirtualSchematikaMachine::shallow_move(DVirtualSchematikaMachine & self, obj gc) noexcept -> Opaque {