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

xo-expression: generalize envframestack + handle explicit lm retturn

Browse source
This commit is contained in:
Roland Conybeare 2025-07-28 13:16:09 -04:00
commit 4ab3a8499b
5 changed files with 56 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/expression/GlobalEnv.cpp
View file

@ -16,9 +16,17 @@ namespace xo {
bp<Expression> expr)
{
this->global_map_[vname] = expr.get();
return expr;
} /*require_global*/
void
GlobalEnv::upsert_local(bp<Variable> target) {
// in practice: paraphrase of .require_global()
this->global_map_[target->name()] = target.promote();
}
void
GlobalEnv::print(std::ostream & os) const {
os << "<GlobalEnv"

15
src/expression/LocalEnv.cpp
View file

@ -70,16 +70,6 @@ namespace xo {
return { free.i_link_ + 1, free.j_slot_ };
} /*lookup_binding*/
bp<Variable>
LocalEnv::lookup_local(const std::string & vname) const {
for (const auto & var : this->argv_) {
if (var->name() == vname)
return var;
}
return bp<Variable>::from_native(nullptr);
}
void
LocalEnv::assign_parent(bp<Environment> p) {
if ((parent_env_.get() != nullptr) && (parent_env_.get() != p.get())) {
@ -110,8 +100,7 @@ namespace xo {
void
LocalEnv::print(std::ostream& os) const {
os << "<localenv"
<< xtag("this", (void*)this)
os << "<LocalEnv"
<< xtag("argv", argv_)
<< ">";
}
@ -125,8 +114,6 @@ namespace xo {
if (ppii.upto()) {
if (!pps->print_upto("<LocalEnv"))
return false;
if (!pps->print_upto_tag("this", (void*)this))
return false;
if (!pps->print_upto_tag("argv", argv_))
return false;
pps->write(">");