From 5172de7862966e8b2dc44f503b5c29d2adde3c8a Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 4 Apr 2026 16:37:17 -0400 Subject: [PATCH] refactor: rename RCollector.std_copy_for -> std_move_for --- xo-alloc2/include/xo/alloc2/gc/RCollector.hpp | 2 +- xo-expression2/src/expression2/DConstant.cpp | 2 +- xo-expression2/src/expression2/DDefineExpr.cpp | 2 +- xo-expression2/src/expression2/DGlobalSymtab.cpp | 2 +- xo-expression2/src/expression2/DIfElseExpr.cpp | 2 +- xo-expression2/src/expression2/DLambdaExpr.cpp | 2 +- xo-expression2/src/expression2/DLocalSymtab.cpp | 2 +- xo-expression2/src/expression2/DSequenceExpr.cpp | 2 +- xo-expression2/src/expression2/DTypename.cpp | 2 +- xo-expression2/src/expression2/DVarRef.cpp | 2 +- xo-expression2/src/expression2/DVariable.cpp | 2 +- xo-interpreter2/src/interpreter2/DClosure.cpp | 2 +- xo-interpreter2/src/interpreter2/DLocalEnv.cpp | 2 +- xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp | 2 +- xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp | 2 +- xo-object2/src/object2/DArray.cpp | 2 +- xo-object2/src/object2/DBoolean.cpp | 2 +- xo-object2/src/object2/DDictionary.cpp | 2 +- xo-object2/src/object2/DFloat.cpp | 2 +- xo-object2/src/object2/DInteger.cpp | 2 +- xo-object2/src/object2/DList.cpp | 2 +- xo-object2/src/object2/DRuntimeError.cpp | 2 +- xo-procedure2/include/xo/procedure2/DPrimitive.hpp | 2 +- xo-reader2/src/reader2/DGlobalEnv.cpp | 2 +- xo-reader2/src/reader2/DSchematikaParser.cpp | 2 +- xo-stringtable2/src/stringtable2/DString.cpp | 2 +- xo-stringtable2/src/stringtable2/DUniqueString.cpp | 2 +- xo-type/src/type/DArrayType.cpp | 2 +- xo-type/src/type/DAtomicType.cpp | 2 +- xo-type/src/type/DFunctionType.cpp | 2 +- xo-type/src/type/DListType.cpp | 2 +- xo-type/src/type/DTypeVarRef.cpp | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp b/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp index 3bb21468..3189a0f0 100644 --- a/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp +++ b/xo-alloc2/include/xo/alloc2/gc/RCollector.hpp @@ -55,7 +55,7 @@ public: /** convenience template for move-constructible T (this is common) **/ template - T * std_copy_for(T * src) noexcept { + T * std_move_for(T * src) noexcept { void * mem = this->alloc_copy_for(src); if (mem) { return new (mem) T(std::move(*src)); diff --git a/xo-expression2/src/expression2/DConstant.cpp b/xo-expression2/src/expression2/DConstant.cpp index 420431bc..46d4cbe9 100644 --- a/xo-expression2/src/expression2/DConstant.cpp +++ b/xo-expression2/src/expression2/DConstant.cpp @@ -80,7 +80,7 @@ namespace xo { DConstant * DConstant::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DDefineExpr.cpp b/xo-expression2/src/expression2/DDefineExpr.cpp index e324b528..b25a655d 100644 --- a/xo-expression2/src/expression2/DDefineExpr.cpp +++ b/xo-expression2/src/expression2/DDefineExpr.cpp @@ -87,7 +87,7 @@ namespace xo { DDefineExpr * DDefineExpr::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DGlobalSymtab.cpp b/xo-expression2/src/expression2/DGlobalSymtab.cpp index 8d0f74cf..58275e54 100644 --- a/xo-expression2/src/expression2/DGlobalSymtab.cpp +++ b/xo-expression2/src/expression2/DGlobalSymtab.cpp @@ -263,7 +263,7 @@ namespace xo { DGlobalSymtab * DGlobalSymtab::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DIfElseExpr.cpp b/xo-expression2/src/expression2/DIfElseExpr.cpp index 3fb71682..81efee1e 100644 --- a/xo-expression2/src/expression2/DIfElseExpr.cpp +++ b/xo-expression2/src/expression2/DIfElseExpr.cpp @@ -91,7 +91,7 @@ namespace xo { DIfElseExpr * DIfElseExpr::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DLambdaExpr.cpp b/xo-expression2/src/expression2/DLambdaExpr.cpp index 4919840b..8069cd3c 100644 --- a/xo-expression2/src/expression2/DLambdaExpr.cpp +++ b/xo-expression2/src/expression2/DLambdaExpr.cpp @@ -141,7 +141,7 @@ namespace xo { DLambdaExpr * DLambdaExpr::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DLocalSymtab.cpp b/xo-expression2/src/expression2/DLocalSymtab.cpp index d1c4930c..60cdd2e2 100644 --- a/xo-expression2/src/expression2/DLocalSymtab.cpp +++ b/xo-expression2/src/expression2/DLocalSymtab.cpp @@ -121,7 +121,7 @@ namespace xo { DLocalSymtab * DLocalSymtab::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DSequenceExpr.cpp b/xo-expression2/src/expression2/DSequenceExpr.cpp index 33149785..ed03affc 100644 --- a/xo-expression2/src/expression2/DSequenceExpr.cpp +++ b/xo-expression2/src/expression2/DSequenceExpr.cpp @@ -122,7 +122,7 @@ namespace xo { DSequenceExpr * DSequenceExpr::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DTypename.cpp b/xo-expression2/src/expression2/DTypename.cpp index 81509949..c9f56cf1 100644 --- a/xo-expression2/src/expression2/DTypename.cpp +++ b/xo-expression2/src/expression2/DTypename.cpp @@ -49,7 +49,7 @@ namespace xo { DTypename * DTypename::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } size_t diff --git a/xo-expression2/src/expression2/DVarRef.cpp b/xo-expression2/src/expression2/DVarRef.cpp index 186fa29a..3b9b2638 100644 --- a/xo-expression2/src/expression2/DVarRef.cpp +++ b/xo-expression2/src/expression2/DVarRef.cpp @@ -67,7 +67,7 @@ namespace xo { DVarRef * DVarRef::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-expression2/src/expression2/DVariable.cpp b/xo-expression2/src/expression2/DVariable.cpp index f11000aa..68a87f67 100644 --- a/xo-expression2/src/expression2/DVariable.cpp +++ b/xo-expression2/src/expression2/DVariable.cpp @@ -47,7 +47,7 @@ namespace xo { DVariable * DVariable::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } size_t diff --git a/xo-interpreter2/src/interpreter2/DClosure.cpp b/xo-interpreter2/src/interpreter2/DClosure.cpp index ca8f3bee..6b346463 100644 --- a/xo-interpreter2/src/interpreter2/DClosure.cpp +++ b/xo-interpreter2/src/interpreter2/DClosure.cpp @@ -71,7 +71,7 @@ namespace xo { DClosure * DClosure::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DLocalEnv.cpp b/xo-interpreter2/src/interpreter2/DLocalEnv.cpp index a12200a0..4124e280 100644 --- a/xo-interpreter2/src/interpreter2/DLocalEnv.cpp +++ b/xo-interpreter2/src/interpreter2/DLocalEnv.cpp @@ -98,7 +98,7 @@ namespace xo { DLocalEnv * DLocalEnv::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp b/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp index 5ccb333c..06a4c23f 100644 --- a/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp +++ b/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp @@ -958,7 +958,7 @@ namespace xo { { (void)gc; - /** TODO: should be able to use gc.std_copy_for(this) now + /** TODO: should be able to use gc.std_move_for(this) now * that shallow_move uses move construction. * DVirtualSchematikaMachine is (or can be made) moveable. **/ diff --git a/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp index c7dca412..129d0d46 100644 --- a/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmApplyClosureFrame.cpp @@ -41,7 +41,7 @@ namespace xo { DVsmApplyClosureFrame * DVsmApplyClosureFrame::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp index f51742f7..d388f9c4 100644 --- a/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmApplyFrame.cpp @@ -49,7 +49,7 @@ namespace xo { DVsmApplyFrame * DVsmApplyFrame::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp index f3a8b35b..02094534 100644 --- a/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmDefContFrame.cpp @@ -40,7 +40,7 @@ namespace xo { DVsmDefContFrame * DVsmDefContFrame::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp index c487ae59..204bfb44 100644 --- a/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmEvalArgsFrame.cpp @@ -50,7 +50,7 @@ namespace xo { DVsmEvalArgsFrame * DVsmEvalArgsFrame::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp index 4978ff9c..511af900 100644 --- a/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmIfElseContFrame.cpp @@ -38,7 +38,7 @@ namespace xo { DVsmIfElseContFrame * DVsmIfElseContFrame::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp b/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp index 7ffea82e..ad006def 100644 --- a/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp +++ b/xo-interpreter2/src/interpreter2/DVsmSeqContFrame.cpp @@ -41,7 +41,7 @@ namespace xo { DVsmSeqContFrame * DVsmSeqContFrame::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-object2/src/object2/DArray.cpp b/xo-object2/src/object2/DArray.cpp index a70213f1..a9ed9288 100644 --- a/xo-object2/src/object2/DArray.cpp +++ b/xo-object2/src/object2/DArray.cpp @@ -183,7 +183,7 @@ namespace xo { DArray * DArray::shallow_move(obj gc) noexcept { - // note: not using gc.std_copy_for() here. + // note: not using gc.std_move_for() here. // flexible array -> compiler doesn't know actual DArray allocation size DArray * copy = (DArray *)gc.alloc_copy((std::byte *)this); diff --git a/xo-object2/src/object2/DBoolean.cpp b/xo-object2/src/object2/DBoolean.cpp index a8d5e85f..f24429e3 100644 --- a/xo-object2/src/object2/DBoolean.cpp +++ b/xo-object2/src/object2/DBoolean.cpp @@ -38,7 +38,7 @@ namespace xo { DBoolean * DBoolean::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } size_t diff --git a/xo-object2/src/object2/DDictionary.cpp b/xo-object2/src/object2/DDictionary.cpp index 2f25f1b7..48b0c97e 100644 --- a/xo-object2/src/object2/DDictionary.cpp +++ b/xo-object2/src/object2/DDictionary.cpp @@ -276,7 +276,7 @@ namespace xo { DDictionary * DDictionary::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-object2/src/object2/DFloat.cpp b/xo-object2/src/object2/DFloat.cpp index 4a9041c0..c00286cc 100644 --- a/xo-object2/src/object2/DFloat.cpp +++ b/xo-object2/src/object2/DFloat.cpp @@ -36,7 +36,7 @@ namespace xo { DFloat * DFloat::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } size_t diff --git a/xo-object2/src/object2/DInteger.cpp b/xo-object2/src/object2/DInteger.cpp index 600f48ec..53625fd2 100644 --- a/xo-object2/src/object2/DInteger.cpp +++ b/xo-object2/src/object2/DInteger.cpp @@ -36,7 +36,7 @@ namespace xo { DInteger * DInteger::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } size_t diff --git a/xo-object2/src/object2/DList.cpp b/xo-object2/src/object2/DList.cpp index f17a53f4..d9e53174 100644 --- a/xo-object2/src/object2/DList.cpp +++ b/xo-object2/src/object2/DList.cpp @@ -187,7 +187,7 @@ namespace xo { DList * DList::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } auto diff --git a/xo-object2/src/object2/DRuntimeError.cpp b/xo-object2/src/object2/DRuntimeError.cpp index a52e1df9..469479c1 100644 --- a/xo-object2/src/object2/DRuntimeError.cpp +++ b/xo-object2/src/object2/DRuntimeError.cpp @@ -61,7 +61,7 @@ namespace xo { DRuntimeError * DRuntimeError::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-procedure2/include/xo/procedure2/DPrimitive.hpp b/xo-procedure2/include/xo/procedure2/DPrimitive.hpp index d55e01ee..0c386a50 100644 --- a/xo-procedure2/include/xo/procedure2/DPrimitive.hpp +++ b/xo-procedure2/include/xo/procedure2/DPrimitive.hpp @@ -199,7 +199,7 @@ namespace xo { template Primitive * Primitive::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } template diff --git a/xo-reader2/src/reader2/DGlobalEnv.cpp b/xo-reader2/src/reader2/DGlobalEnv.cpp index 243fc8d6..2893beda 100644 --- a/xo-reader2/src/reader2/DGlobalEnv.cpp +++ b/xo-reader2/src/reader2/DGlobalEnv.cpp @@ -116,7 +116,7 @@ namespace xo { DGlobalEnv * DGlobalEnv::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-reader2/src/reader2/DSchematikaParser.cpp b/xo-reader2/src/reader2/DSchematikaParser.cpp index 35edc124..e25e76aa 100644 --- a/xo-reader2/src/reader2/DSchematikaParser.cpp +++ b/xo-reader2/src/reader2/DSchematikaParser.cpp @@ -195,7 +195,7 @@ namespace xo { { (void)gc; - /** TODO: may be feasible to use gc.std_copy_for(this) + /** TODO: may be feasible to use gc.std_move_for(this) * if/when DSchematikaParser is moveable **/ assert(false); diff --git a/xo-stringtable2/src/stringtable2/DString.cpp b/xo-stringtable2/src/stringtable2/DString.cpp index 81f7780c..c3340f46 100644 --- a/xo-stringtable2/src/stringtable2/DString.cpp +++ b/xo-stringtable2/src/stringtable2/DString.cpp @@ -158,7 +158,7 @@ namespace xo { DString * DString::shallow_move(obj gc) noexcept { - // note: not using gc.std_copy_for() here + // note: not using gc.std_move_for() here // b/c DString flexible array means not move-constructible DString * copy = (DString *)gc.alloc_copy_for(this); diff --git a/xo-stringtable2/src/stringtable2/DUniqueString.cpp b/xo-stringtable2/src/stringtable2/DUniqueString.cpp index 057ee1f3..1d107f67 100644 --- a/xo-stringtable2/src/stringtable2/DUniqueString.cpp +++ b/xo-stringtable2/src/stringtable2/DUniqueString.cpp @@ -92,7 +92,7 @@ namespace xo { { // well-posed, but not expected to be used. // - // Not using gc.std_copy_for() here because compiler doesn't know + // Not using gc.std_move_for() here because compiler doesn't know // actual alloc size of a DUniqueString instance assert(false); diff --git a/xo-type/src/type/DArrayType.cpp b/xo-type/src/type/DArrayType.cpp index 52d25f5a..46bad06c 100644 --- a/xo-type/src/type/DArrayType.cpp +++ b/xo-type/src/type/DArrayType.cpp @@ -85,7 +85,7 @@ namespace xo { DArrayType * DArrayType::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-type/src/type/DAtomicType.cpp b/xo-type/src/type/DAtomicType.cpp index d4f0b166..c5d30330 100644 --- a/xo-type/src/type/DAtomicType.cpp +++ b/xo-type/src/type/DAtomicType.cpp @@ -63,7 +63,7 @@ namespace xo { DAtomicType * DAtomicType::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-type/src/type/DFunctionType.cpp b/xo-type/src/type/DFunctionType.cpp index 8cb9001b..83462b8d 100644 --- a/xo-type/src/type/DFunctionType.cpp +++ b/xo-type/src/type/DFunctionType.cpp @@ -96,7 +96,7 @@ namespace xo { DFunctionType * DFunctionType::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-type/src/type/DListType.cpp b/xo-type/src/type/DListType.cpp index 487cc5fe..49557777 100644 --- a/xo-type/src/type/DListType.cpp +++ b/xo-type/src/type/DListType.cpp @@ -90,7 +90,7 @@ namespace xo { DListType * DListType::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t diff --git a/xo-type/src/type/DTypeVarRef.cpp b/xo-type/src/type/DTypeVarRef.cpp index a712174f..e9119d17 100644 --- a/xo-type/src/type/DTypeVarRef.cpp +++ b/xo-type/src/type/DTypeVarRef.cpp @@ -84,7 +84,7 @@ namespace xo { DTypeVarRef * DTypeVarRef::shallow_move(obj gc) noexcept { - return gc.std_copy_for(this); + return gc.std_move_for(this); } std::size_t