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

xo-expression: fix: ns xo::ref::rp -> xo::rp

Browse source
This commit is contained in:
Roland Conybeare 2024-08-05 15:04:34 -04:00
commit ca19c65b02
12 changed files with 70 additions and 75 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/expression/Lambda.cpp
View file

@ -9,14 +9,13 @@
namespace xo {
using xo::reflect::TypeDescrBase;
using xo::reflect::FunctionTdxInfo;
using xo::ref::rp;
using std::stringstream;
namespace ast {
rp<Lambda>
Lambda::make(const std::string & name,
const std::vector<rp<Variable>> & argv,
const ref::rp<Expression> & body)
const rp<Expression> & body)
{
using xo::reflect::FunctionTdx;
@ -69,7 +68,7 @@ namespace xo {
return retval;
} /*calc_free_variables*/
std::map<std::string, ref::rp<Variable>>
std::map<std::string, rp<Variable>>
Lambda::regularize_layer_vars()
{
/* regularize local_env+body: make sure exactly one instance
@ -83,7 +82,7 @@ namespace xo {
* Motivation is to unify Variables that would use the same
* binding_path to resolve their runtime location.
*/
std::map<std::string, ref::rp<Variable>> var_map;
std::map<std::string, rp<Variable>> var_map;
for (const auto & arg : local_env_->argv()) {
/* each arg name can appear at most once
@ -96,7 +95,7 @@ namespace xo {
this->body_
= (body_->xform_layer
([&var_map](ref::brw<Expression> x) -> ref::rp<Expression>
([&var_map](ref::brw<Expression> x) -> rp<Expression>
{
if (x->extype() == exprtype::variable) {
ref::brw<Variable> var = Variable::from(x);