From 200a0271039f24ec5c9ef99f9df29a607ea262e0 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sat, 2 May 2026 13:58:22 -0400 Subject: [PATCH] tidy: drop stale ACollector comments --- xo-expression2/src/expression2/DGlobalSymtab.cpp | 4 ---- xo-expression2/src/expression2/DLocalSymtab.cpp | 2 -- xo-expression2/src/expression2/DSequenceExpr.cpp | 3 --- xo-gc/src/gc/GCObjectStore.cpp | 8 ++------ .../src/interpreter2/DVirtualSchematikaMachine.cpp | 5 ++--- xo-object2/include/xo/object2/DArray.hpp | 1 - xo-object2/src/object2/DArray.cpp | 2 -- xo-object2/src/object2/DDictionary.cpp | 3 --- xo-reader2/src/reader2/DApplySsm.cpp | 1 - xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp | 4 ---- xo-reader2/src/reader2/DExpectQArraySsm.cpp | 2 -- xo-reader2/src/reader2/DGlobalEnv.cpp | 2 -- 12 files changed, 4 insertions(+), 33 deletions(-) diff --git a/xo-expression2/src/expression2/DGlobalSymtab.cpp b/xo-expression2/src/expression2/DGlobalSymtab.cpp index 30878f4d..f4704fa6 100644 --- a/xo-expression2/src/expression2/DGlobalSymtab.cpp +++ b/xo-expression2/src/expression2/DGlobalSymtab.cpp @@ -111,8 +111,6 @@ namespace xo { { scope log(XO_DEBUG(false), std::string_view(*var->name())); - //auto gc = mm.try_to_facet(); - // It's possible there's already a global variable // with the same name. // @@ -197,8 +195,6 @@ namespace xo { scope log(XO_DEBUG(true), std::string_view(*tname->name())); - //auto gc = mm.try_to_facet(); - auto ix = type_map_->find(tname->name()); if (ix == type_map_->end()) { diff --git a/xo-expression2/src/expression2/DLocalSymtab.cpp b/xo-expression2/src/expression2/DLocalSymtab.cpp index c8b5b1fd..1cb69b84 100644 --- a/xo-expression2/src/expression2/DLocalSymtab.cpp +++ b/xo-expression2/src/expression2/DLocalSymtab.cpp @@ -70,7 +70,6 @@ namespace xo { DVariable * var = DVariable::make(mm, name, typeref, binding); - //auto gc = mm.try_to_facet(); vars_->push_back(mm, obj(var)); return binding; @@ -89,7 +88,6 @@ namespace xo { } else { obj tname = DTypename::make(mm, name, type); - //auto gc = mm.try_to_facet(); types_->push_back(mm, tname); } } diff --git a/xo-expression2/src/expression2/DSequenceExpr.cpp b/xo-expression2/src/expression2/DSequenceExpr.cpp index bdff6270..fd55a114 100644 --- a/xo-expression2/src/expression2/DSequenceExpr.cpp +++ b/xo-expression2/src/expression2/DSequenceExpr.cpp @@ -72,9 +72,6 @@ namespace xo { DSequenceExpr::push_back(obj mm, obj expr) { - // null gc -> no write barrier - //obj gc = mm.try_to_facet(); - if (expr_v_->size() == expr_v_->capacity()) { /* reallocate+expand */ diff --git a/xo-gc/src/gc/GCObjectStore.cpp b/xo-gc/src/gc/GCObjectStore.cpp index 3be25127..fb29873e 100644 --- a/xo-gc/src/gc/GCObjectStore.cpp +++ b/xo-gc/src/gc/GCObjectStore.cpp @@ -346,8 +346,8 @@ namespace xo { recd->upsert_cstr(mm, "n-live", DInteger::box(mm, 0)); recd->upsert_cstr(mm, "bytes", DInteger::box(mm, 0)); - stats_v->assign_at(mm, //mm.try_to_facet(), - tseq.seqno(), obj(recd)); + stats_v->assign_at(mm, tseq.seqno(), + obj(recd)); } } @@ -392,8 +392,6 @@ namespace xo { auto recd = stats_v->at(i); if (recd) { - //obj mm = mm.try_to_facet(); - bool ok = final_stats_v->push_back(mm, recd); assert(ok); } @@ -451,8 +449,6 @@ namespace xo { recd->upsert_cstr(mm, "n-live", DInteger::box(mm, 0)); recd->upsert_cstr(mm, "bytes", DInteger::box(mm, 0)); - //obj gc = mm.try_to_facet(); - stats_v->push_back(mm, obj(recd)); } diff --git a/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp b/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp index c8604e50..021a38ea 100644 --- a/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp +++ b/xo-interpreter2/src/interpreter2/DVirtualSchematikaMachine.cpp @@ -75,7 +75,8 @@ namespace xo { // establish the set of types that mm_ will be able to collect - CollectorTypeRegistry::instance().install_types(retval.to_op().to_facet()); + CollectorTypeRegistry::instance().install_types + (retval.to_op().to_facet()); return retval; } @@ -821,8 +822,6 @@ namespace xo { log && log(xtag("i_arg", i_arg), xtag("n_arg", args->size()), xtag("cap", args->capacity())); - //auto gc = mm_.to_op().to_facet(); - args->push_back(mm_.to_op(), value); i_arg = evalargs_frame->increment_arg(); diff --git a/xo-object2/include/xo/object2/DArray.hpp b/xo-object2/include/xo/object2/DArray.hpp index 2dc8e931..64d7f52c 100644 --- a/xo-object2/include/xo/object2/DArray.hpp +++ b/xo-object2/include/xo/object2/DArray.hpp @@ -203,7 +203,6 @@ namespace xo { DArray * DArray::array(obj mm, Args... args) { - //obj gc = mm.try_to_facet(); DArray * result = _empty(mm, sizeof...(args)); if (result) { detail::do_array_push_back(result, mm, args...); diff --git a/xo-object2/src/object2/DArray.cpp b/xo-object2/src/object2/DArray.cpp index b22b748e..2a5c590e 100644 --- a/xo-object2/src/object2/DArray.cpp +++ b/xo-object2/src/object2/DArray.cpp @@ -4,7 +4,6 @@ **/ #include "DArray.hpp" -//#include "gc/RCollector_aux.hpp" #include #include #include @@ -16,7 +15,6 @@ namespace xo { using xo::print::APrintable; using xo::facet::FacetRegistry; using xo::mm::AGCObject; - //using xo::mm::mm_do_assign; using xo::facet::typeseq; namespace scm { diff --git a/xo-object2/src/object2/DDictionary.cpp b/xo-object2/src/object2/DDictionary.cpp index 2f52cae3..9e05cfa9 100644 --- a/xo-object2/src/object2/DDictionary.cpp +++ b/xo-object2/src/object2/DDictionary.cpp @@ -148,7 +148,6 @@ namespace xo { const DString * k1 = DString::from_cstr(mm, key_cstr); if (k1) { - //obj gc = mm.try_to_facet(); return this->try_upsert(mm, std::make_pair(k1, value)); } @@ -181,8 +180,6 @@ namespace xo { bool DDictionary::upsert(obj mm, const pair_type & kv_pair) { - //obj gc = mm.try_to_facet(); - if (this->try_update(mm, kv_pair)) return true; diff --git a/xo-reader2/src/reader2/DApplySsm.cpp b/xo-reader2/src/reader2/DApplySsm.cpp index ee043ddd..0a616e9a 100644 --- a/xo-reader2/src/reader2/DApplySsm.cpp +++ b/xo-reader2/src/reader2/DApplySsm.cpp @@ -233,7 +233,6 @@ namespace xo { assert(expr_gco); obj mm(&(p_psm->parser_alloc())); - //auto gc = obj(mm).try_to_facet(); if (args_expr_v_->size() == args_expr_v_->capacity()) { // need to expand .args_expr_v_ capacity. diff --git a/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp b/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp index 3d86158c..7036ffb5 100644 --- a/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp +++ b/xo-reader2/src/reader2/DExpectFormalArglistSsm.cpp @@ -201,8 +201,6 @@ namespace xo { obj mm(&parser_alloc); DArray * argl_2x = DArray::_empty(mm, 2 * argl_->capacity()); - //auto gc = obj(mm).try_to_facet(); - for (DArray::size_type i = 0, n = argl_->size(); i < n; ++i) { // TODO: prefer non-bounds-checked access here argl_2x->push_back(mm, argl_->at(i)); @@ -212,8 +210,6 @@ namespace xo { this->argl_ = argl_2x; } - //auto gc = expr_alloc.try_to_facet(); - this->argl_->push_back(expr_alloc, var_o); } diff --git a/xo-reader2/src/reader2/DExpectQArraySsm.cpp b/xo-reader2/src/reader2/DExpectQArraySsm.cpp index eda20eb2..b06920c4 100644 --- a/xo-reader2/src/reader2/DExpectQArraySsm.cpp +++ b/xo-reader2/src/reader2/DExpectQArraySsm.cpp @@ -178,8 +178,6 @@ namespace xo { DExpectQArraySsm::on_quoted_literal(obj lit, ParserStateMachine * p_psm) { - //auto gc = p_psm->expr_alloc().try_to_facet(); - if(state_.code() == QArrayXst::code::qarray_1a) { // append lit at the end of array_ { diff --git a/xo-reader2/src/reader2/DGlobalEnv.cpp b/xo-reader2/src/reader2/DGlobalEnv.cpp index c1caf833..0343d2c2 100644 --- a/xo-reader2/src/reader2/DGlobalEnv.cpp +++ b/xo-reader2/src/reader2/DGlobalEnv.cpp @@ -85,8 +85,6 @@ namespace xo { values_->resize(ix.j_slot() + 1); } - //auto gc = mm.try_to_facet(); - values_->assign_at(mm, ix.j_slot(), x);