roland/xo-expression2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

xo-interpreter2 stack: scaffold DClosure, DLocalEnv [WIP]

Browse source
This commit is contained in:
Roland Conybeare 2026-02-04 19:17:07 -05:00
commit c9c43fbef2
14 changed files with 295 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

5
xo-alloc2/include/xo/alloc2/alloc/RAllocator.hpp
View file

@ -31,6 +31,11 @@ namespace xo {
requires std::is_same_v<typename Object::DataType, xo::facet::DVariantPlaceholder>
: Object(iface, data) {}
template <typename T>
void * alloc_for() noexcept {
return O::iface()->alloc(O::data(), typeseq::id<T>(), sizeof(T));
}
typeseq _typeseq() const noexcept { return O::iface()->_typeseq(); }
void _drop() const noexcept { O::iface()->_drop(O::data()); }
std::string_view name() const noexcept { return O::iface()->name(O::data()); }

2
xo-expression2/include/xo/expression2/DLambdaExpr.hpp
View file

@ -23,6 +23,7 @@ namespace xo {
using AAllocator = xo::mm::AAllocator;
using TypeDescr = xo::reflect::TypeDescr;
using ppindentinfo = xo::print::ppindentinfo;
using size_type = DLocalSymtab::size_type;
public:
@ -60,6 +61,7 @@ namespace xo {
///@{
DLocalSymtab * local_symtab() const noexcept { return local_symtab_; }
size_type n_args() const noexcept { return local_symtab_->size(); }
// get_free_variables()
// visit_preorder()

2
xo-expression2/include/xo/expression2/DLocalSymtab.hpp
View file

@ -101,7 +101,7 @@ namespace xo {
private:
/** parent symbol table from scoping surrounding this one **/
DLocalSymtab * parent_ = nullptr;
/** actual range of slots_[] array. Can use inices in [0,..,n) **/
/** actual range of slots_[] array. Can use indices in [0,..,n) **/
size_type capacity_ = 0;
/** number of slots in use **/
size_type size_ = 0;

13
xo-expression2/include/xo/expression2/LambdaExpr.hpp Normal file
View file

@ -0,0 +1,13 @@
/** @file LambdaExpr.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
#include "DLambdaExpr.hpp"
#include "detail/IExpression_DLambdaExpr.hpp"
//#include "detail/IGCObject_DLambdaExpr.hpp"
#include "detail/IPrintable_DLambdaExpr.hpp"
/* end LambdaExpr.hpp */

12
xo-expression2/include/xo/expression2/LocalSymtab.hpp Normal file
View file

@ -0,0 +1,12 @@
/** @file LocalSymtab.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
#include "DLocalSymtab.hpp"
#include "symtab/ISymbolTable_DLocalSymtab.hpp"
#include "symtab/IPrintable_DLocalSymtab.hpp"
/* end LocalSymtab.hpp */

3
xo-facet/codegen/genfacet
View file

@ -314,6 +314,8 @@ def gen_facet_impl(env,
router_facet = f'R{facet_name}'
# RFoo.hpp
router_facet_hpp_fname = f'{router_facet}.hpp'
# user defined content -- whatever you want
router_facet_explicit_content = facet_idl['router_facet_explicit_content']
# ================================================================
# vars for IFacet_DRepr
@ -384,6 +386,7 @@ def gen_facet_impl(env,
'router_facet': router_facet,
'router_facet_hpp_j2': 'router_facet.hpp.j2',
'router_facet_hpp_fname': router_facet_hpp_fname,
'router_facet_explicit_content': router_facet_explicit_content,
#
'types': facet_types,
'local_types': local_types,

5
xo-facet/codegen/router_facet.hpp.j2
View file

@ -56,6 +56,11 @@ public:
///@{
{% endif %}
// explicit injected content
{% for c in router_facet_explicit_content %}
{{c}}
{% endif %}
// builtin methods
typeseq _typeseq() const noexcept { return O::iface()->_typeseq(); }
void _drop() const noexcept { O::iface()->_drop(O::data()); }

49
xo-interpreter2/include/xo/interpreter2/DClosure.hpp Normal file
View file

@ -0,0 +1,49 @@
/** @file DClosure.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#include "LocalEnv.hpp"
#include <xo/expression2/LambdaExpr.hpp>
namespace xo {
namespace scm {
/** @brief runtime representation for a procedure
*
* Maintains lambda + captured lexical context
**/
class DClosure {
public:
using AAllocator = xo::mm::AAllocator;
using size_type = std::int32_t;
public:
DClosure(const DLambdaExpr * lm,
const DLocalEnv * env);
/** create instance using memory from @p mm
* for lambda @p lm with captured environment @p env.
**/
static DClosure * make(obj<AAllocator> mm,
const DLambdaExpr * lm,
const DLocalEnv * env);
/** for now, support just fixed-arity procedures **/
bool is_nary() const noexcept { return false; }
/** number of arguments expected by this procedure (-1 if nary) **/
size_type n_args() const noexcept { return lambda_->n_args(); }
private:
/** lambda expression **/
const DLambdaExpr * lambda_ = nullptr;
/** bindings for captured variables
* (from lexical context where lambda evaluated)
**/
const DLocalEnv * env_ = nullptr;
};
} /*namespace scm*/
} /*namespace xo*/
/* end DClosure.hpp */

67
xo-interpreter2/include/xo/interpreter2/DLocalEnv.hpp Normal file
View file

@ -0,0 +1,67 @@
/** @file DLocalEnv.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
#include <xo/expression2/LocalSymtab.hpp>
#include <xo/object2/DArray.hpp>
namespace xo {
namespace scm {
/** @brief bindings for arguments to a lambda
**/
class DLocalEnv {
public:
using DArray = xo::scm::DArray;
using AAllocator = xo::mm::AAllocator;
using AGCObject = xo::mm::AGCObject;
using ppindentinfo = xo::print::ppindentinfo;
using size_type = std::uint32_t;
public:
/** @defgroup scm-localenv-constructors constructors **/
///@{
/** empty instance with parent @p p for variables in @p symtab **/
DLocalEnv(DLocalEnv * parent,
DLocalSymtab * symtab,
DArray * args);
static DLocalEnv * _make_empty(obj<AAllocator> mm,
DLocalEnv * parent,
DLocalSymtab * symtab,
DArray * args);
///@}
/** @defgroup scm-local-env-methods methods **/
///@{
DLocalEnv * parent() const noexcept { return parent_; }
size_type size() const noexcept { return symtab_->size(); }
/** lookup current value associated with binding @p ix **/
obj<AGCObject> lookup_value(Binding ix) const noexcept;
/** assign value associated with binding @p ix to @p x **/
void assign_value(Binding ix, obj<AGCObject> x);
///@}
private:
/** parent environment (from closure) **/
DLocalEnv * parent_ = nullptr;
/** bind values for variables in this symbol table **/
DLocalSymtab * symtab_ = nullptr;
/** bindings.
* (*args)[i] associates a value with symtab->slots_[i]
**/
DArray * args_ = nullptr;;
};
} /*namespace scm*/
} /*namespace xo*/
/* end DLocalEnv.hpp */

1
xo-interpreter2/include/xo/interpreter2/DVsmApplyFrame.hpp
View file

@ -21,6 +21,7 @@ namespace xo {
VsmInstr old_cont,
DArray * args);
/** create instance using memory from @p mm **/
static DVsmApplyFrame * make(obj<AAllocator> mm,
obj<AGCObject> old_parent,
VsmInstr old_cont,

12
xo-interpreter2/include/xo/interpreter2/LocalEnv.hpp Normal file
View file

@ -0,0 +1,12 @@
/** @file LocalEnv.hpp
*
* @author Roland Conybeare, Feb 2026
**/
#pragma once
#include "DLocalEnv.hpp"
//#include "detail/IGCObject_DLocalEnv.hpp"
//#include "detail/IPrintable_DLocalEnv.hpp"
/* end LocalEnv.hpp */

4
xo-interpreter2/src/interpreter2/CMakeLists.txt
View file

@ -17,6 +17,10 @@ set(SELF_SRCS
IPrintable_DVsmApplyFrame.cpp
VsmInstr.cpp
DClosure.cpp
DLocalEnv.cpp
#IExpression_Any.cpp
)

29
xo-interpreter2/src/interpreter2/DClosure.cpp Normal file
View file

@ -0,0 +1,29 @@
/** @file DClosure.cpp
*
* @author Roland Conybeare, Feb 2026
**/
#include "DClosure.hpp"
namespace xo {
namespace scm {
DClosure::DClosure(const DLambdaExpr * lm,
const DLocalEnv * env)
: lambda_{lm}, env_{env}
{}
DClosure *
DClosure::make(obj<AAllocator> mm,
const DLambdaExpr * lm,
const DLocalEnv * env)
{
void * mem = mm.alloc_for<DClosure>();
return new (mem) DClosure(lm, env);
}
} /*namespace scm*/
} /*namespace xo*/
/* end DClosure.cpp */

92
xo-interpreter2/src/interpreter2/DLocalEnv.cpp Normal file
View file

@ -0,0 +1,92 @@
/** @file DLocalEnv.cpp
*
* @author Roland Conybeare, Feb 2026
**/
#include "DLocalEnv.hpp"
#include <xo/reflectutil/typeseq.hpp>
namespace xo {
using xo::mm::AGCObject;
using xo::reflect::typeseq;
namespace scm {
DLocalEnv::DLocalEnv(DLocalEnv * parent,
DLocalSymtab * symtab,
DArray * args)
: parent_{parent},
symtab_{symtab},
args_{args}
{}
DLocalEnv *
DLocalEnv::_make_empty(obj<AAllocator> mm,
DLocalEnv * parent,
DLocalSymtab * symtab,
DArray * args)
{
assert(symtab);
void * mem = mm.alloc_for<DLocalEnv>();
return new (mem) DLocalEnv(parent, symtab, args);
}
obj<AGCObject>
DLocalEnv::lookup_value(Binding ix) const noexcept
{
assert(!ix.is_global());
const DLocalEnv * env = this;
for (auto i = ix.i_link(); i > 0; --i) {
env = env->parent();
}
if (env) {
auto j = ix.j_slot();
if (j < static_cast<decltype(j)>(env->size())) {
return (*(env->args_))[j];
} else {
assert(false);
}
} else {
assert(false);
}
/* something terribly wrong if control here */
return obj<AGCObject>();
}
void
DLocalEnv::assign_value(Binding ix, obj<AGCObject> x)
{
assert(!ix.is_global());
const DLocalEnv * env = this;
for (auto i = ix.i_link(); i > 0; --i) {
env = env->parent();
}
if (env) {
auto j = ix.j_slot();
if (j < static_cast<decltype(j)>(env->size())) {
(*(env->args_))[j] = x;
} else {
assert(false);
}
} else {
assert(false);
}
/* something terribly wrong if control here */
}
} /*namespace scm*/
} /*namespace xo*/
/* end DLocalEnv.cpp */