From 174e363c9a6279503e5f14d0ce1627b26c5bc287 Mon Sep 17 00:00:00 2001 From: Roland Conybeare Date: Sun, 15 Mar 2026 11:40:24 -0500 Subject: [PATCH] xo-interpreter2 stack: refactor: move dict pms to object2/ --- src/interpreter2/VirtualSchematikaMachine.cpp | 69 +------------------ 1 file changed, 2 insertions(+), 67 deletions(-) diff --git a/src/interpreter2/VirtualSchematikaMachine.cpp b/src/interpreter2/VirtualSchematikaMachine.cpp index a4ed2810..b02d5c58 100644 --- a/src/interpreter2/VirtualSchematikaMachine.cpp +++ b/src/interpreter2/VirtualSchematikaMachine.cpp @@ -206,7 +206,8 @@ namespace xo { log && log(xtag("expr", expr_pr)); if (value_.value()) { - auto value_pr = const_cast *>(value_.value())->to_facet(); + auto value_pr + = const_cast *>(value_.value())->to_facet(); if (value_pr) log && log(xtag("value", value_pr)); } else { @@ -954,48 +955,6 @@ namespace xo { static DPrimitive_gco_1_gco s_fn_n_args_pm("_fn_n_args", &xfer_fn_n_args); - // ----- primitive: dict_make() ----- - - obj - xfer_dict_make(obj rcx) - { - return obj(DDictionary::empty(rcx.allocator(), - 8 /*cap*/)); - } - - static DPrimitive_gco_0 s_dict_make_pm("_dict_make", - &xfer_dict_make); - - // ----- primitive: dict_upsert() ----- - - obj - xfer_dict_upsert(obj rcx, - obj dict, - obj key, - obj value) - { - scope log(XO_DEBUG(true)); - - log && log(xtag("dict.tseq", dict._typeseq()), - xtag("dict.tname", TypeRegistry::id2name(dict._typeseq()))); - log && log(xtag("key.tseq", key._typeseq()), - xtag("key.tname", TypeRegistry::id2name(key._typeseq()))); - log && log(xtag("value.tseq", value._typeseq()), - xtag("value.tname", TypeRegistry::id2name(value._typeseq()))); - - auto value_pr = FacetRegistry::instance().variant(value); - - log && log(xtag("value", value_pr)); - - dict->upsert(rcx.allocator(), - DDictionary::pair_type(key.data(), value)); - - return dict; - } - - static DPrimitive_gco_3_dict_string_gco s_dict_upsert_pm("_dict_upsert", - &xfer_dict_upsert); - // ----- install primitives ----- void @@ -1048,30 +1007,6 @@ namespace xo { Reflect::require(), obj(&s_fn_n_args_pm)); } - - /* dict_make */ - { - const DUniqueString * name - = reader_.intern_string("dict_make"); - - global_env_->_upsert_value - (mm_.to_op(), - name, - Reflect::require(), - obj(&s_dict_make_pm)); - } - - /* dict_upsert */ - { - const DUniqueString * name - = reader_.intern_string("dict_upsert"); - - global_env_->_upsert_value - (mm_.to_op(), - name, - Reflect::require(), - obj(&s_dict_upsert_pm)); - } } } /*namespace scm*/