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

xo-expression: refactor: LocalEnv::owner -> origin

Browse source
This commit is contained in:
Roland Conybeare 2024-07-02 14:22:11 -04:00
commit a94c55304b
2 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

14
include/xo/expression/LocalEnv.hpp
View file

@ -28,15 +28,15 @@ namespace xo {
return new LocalEnv(argv);
}
Lambda * owner() const { return owner_; }
Lambda * origin() const { return origin_; }
const std::vector<ref::rp<Variable>> & argv() const { return argv_; }
int n_arg() const { return argv_.size(); }
TypeDescr fn_arg(uint32_t i) const { return argv_[i]->valuetype(); }
/** single-assign this environment's owner **/
void assign_owner(Lambda * p) {
assert(owner_ == nullptr);
owner_ = p;
/** single-assign this environment's origin **/
void assign_origin(Lambda * p) {
assert(origin_ == nullptr);
origin_ = p;
}
/** single-assign this environment's parent **/
@ -68,10 +68,10 @@ namespace xo {
*
* Invariant:
* @code
* owner_->local_env_ == this
* origin_->local_env_ == this
* @endcode
**/
Lambda * owner_ = nullptr;
Lambda * origin_ = nullptr;
/** formal argument names **/
std::vector<ref::rp<Variable>> argv_;

2
src/expression/Lambda.cpp
View file

@ -48,7 +48,7 @@ namespace xo {
body);
/* need two-phase construction b/c pointer cycle */
env->assign_owner(retval.get());
env->assign_origin(retval.get());
return retval;
} /*make*/