xo-reader xo-expression: nested lambdas working properly + docs

xo-expression/src/expression/LocalEnv.cpp

@@ -4,12 +4,43 @@
  */
 
 #include "LocalEnv.hpp"
+#include "xo/indentlog/print/vector.hpp"
 
 namespace xo {
     namespace ast {
-        binding_path
-        LocalEnv::lookup_local_binding(const std::string & vname) const
+        rp<LocalEnv>
+        LocalEnv::make_empty() {
+            return new LocalEnv(std::vector<rp<Variable>>(), nullptr);
+        }
+
+        rp<LocalEnv>
+        LocalEnv::make(const std::vector<rp<Variable>> & argv,
+                       const rp<Environment> & parent_env)
         {
+            return new LocalEnv(argv, parent_env);
+        }
+
+        rp<LocalEnv>
+        LocalEnv::make1(const rp<Variable> & arg1,
+                        const rp<Environment> & parent_env)
+        {
+            std::vector<rp<Variable>> argv = { arg1 };
+
+            return make(argv, parent_env);
+        }
+
+        LocalEnv::LocalEnv(const std::vector<rp<Variable>> & argv,
+                           const rp<Environment> & parent_env)
+            : origin_{nullptr},
+              argv_(argv),
+              parent_env_{parent_env}
+        {
+            constexpr bool c_debug_flag = true;
+            scope log(XO_DEBUG(c_debug_flag), xtag("this", (void*)this), xtag("argv", argv_));
+        }
+
+        binding_path
+        LocalEnv::lookup_local_binding(const std::string & vname) const {
             int j_slot = 0;
             for (const auto & arg : argv_) {
                 if (arg->name() == vname)
@@ -21,11 +52,9 @@ namespace xo {
         } /*lookup_local_binding*/
 
         binding_path
-        LocalEnv::lookup_binding(const std::string & vname) const
-        {
+        LocalEnv::lookup_binding(const std::string & vname) const {
             {
                 auto local = this->lookup_local_binding(vname);
-
                 if (local.i_link_ == 0)
                     return local;
             }
@@ -37,6 +66,52 @@ namespace xo {
             else
                 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())) {
+                throw std::runtime_error(tostr("LocalEnv::assign_parent(P2): already have established parent P1",
+                                               xtag("P1", parent_env_),
+                                               xtag("P2", p)));
+
+                assert(false);
+            }
+
+            parent_env_ = p.promote();
+        }
+
+        void
+        LocalEnv::upsert_local(bp<Variable> target) {
+            for (auto & var : this->argv_)  {
+                if (var->name() == target->name()) {
+                    /* replace existing variable.  May change its type */
+                    var = target.promote();
+                    return;
+                }
+            }
+
+            /* control here: target not already present in this frame -> append */
+
+            this->argv_.push_back(target.promote());
+        }
+
+        void
+        LocalEnv::print(std::ostream& os) const {
+            os << "<localenv"
+               << xtag("this", (void*)this)
+               << xtag("argv", argv_)
+               << ">";
+        }
     } /*namespace ast*/
 } /*namespace xo*/