xo-interpreter2 stack: lambda expr -> closure runs in VSM utest

src/interpreter2/CMakeLists.txt

@@ -17,10 +17,12 @@ set(SELF_SRCS
     IPrintable_DVsmApplyFrame.cpp
 
     DClosure.cpp
-    IGCObject_DClosure.cpp
     IProcedure_DClosure.cpp
+    IGCObject_DClosure.cpp
+    IPrintable_DClosure.cpp
 
     IGCObject_DLocalEnv.cpp
+    IPrintable_DLocalEnv.cpp
     DLocalEnv.cpp
 
     VsmInstr.cpp

src/interpreter2/DClosure.cpp

@@ -10,6 +10,7 @@
 
 namespace xo {
     using xo::mm::AGCObject;
+    using xo::print::APrintable;
 
     namespace scm {
 
@@ -69,6 +70,24 @@ namespace xo {
             return shallow_size();
         }
 
+        // ----- printable facet -----
+
+        bool
+        DClosure::pretty(const ppindentinfo & ppii) const
+        {
+            obj<APrintable,DLambdaExpr> lambda_pr(const_cast<DLambdaExpr *>(lambda_));
+            obj<APrintable,DLocalEnv> env_pr(const_cast<DLocalEnv *>(env_));
+
+            bool lambda_present = lambda_pr;
+            bool env_present = env_pr;
+
+            return ppii.pps()->pretty_struct
+                (ppii,
+                 "DClosure",
+                 refrtag("lambda", lambda_pr, lambda_present),
+                 refrtag("env", env_pr, env_present));
+        }
+
     } /*namespace scm*/
 } /*namespace xo*/
 

src/interpreter2/DLocalEnv.cpp

@@ -121,6 +121,22 @@ namespace xo {
             return shallow_size();
         }
 
+        // ----- printable facet -----
+
+        bool
+        DLocalEnv::pretty(const ppindentinfo & ppii) const noexcept
+        {
+            // print local bindings, perhaps
+            //   symtab_
+            //   args_
+
+            return ppii.pps()->pretty_struct
+                (ppii,
+                 "DLocalEnv",
+                 refrtag("n_args", args_->size())
+                    );
+        }
+
     } /*namespace scm*/
 } /*namespace xo*/
 

src/interpreter2/IPrintable_DLocalEnv.cpp

@@ -0,0 +1,28 @@
+/** @file IPrintable_DLocalEnv.cpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/IPrintable_DLocalEnv.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_any.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/IPrintable_DLocalEnv.json5]
+**/
+
+#include "detail/IPrintable_DLocalEnv.hpp"
+
+namespace xo {
+    namespace scm {
+        auto
+        IPrintable_DLocalEnv::pretty(const DLocalEnv & self, const ppindentinfo & ppii) -> bool
+        {
+            return self.pretty(ppii);
+        }
+
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end IPrintable_DLocalEnv.cpp */

src/interpreter2/VirtualSchematikaMachine.cpp

@@ -241,10 +241,9 @@ namespace xo {
                                                 lambda.data(),
                                                 local_env_);
 
-            this->value_ = obj<AGCObject>(obj<AGCObject,DClosure>(closure));
-
-            // not implemented
-            assert(false);
+            this->value_
+                = obj<AGCObject>(obj<AGCObject,DClosure>(closure));
+            this->pc_ = this->cont_;
         }
 
         void

src/interpreter2/interpreter2_register_facets.cpp

@@ -8,6 +8,7 @@
 #include "VsmApplyFrame.hpp"
 #include "VsmEvalArgsFrame.hpp"
 #include "Closure.hpp"
+#include "LocalEnv.hpp"
 
 #include <xo/printable2/detail/APrintable.hpp>
 #include <xo/facet/FacetRegistry.hpp>
@@ -37,9 +38,13 @@ namespace xo {
             FacetRegistry::register_impl<AGCObject, DVsmEvalArgsFrame>();
             FacetRegistry::register_impl<APrintable, DVsmEvalArgsFrame>();
 
+            FacetRegistry::register_impl<AProcedure, DClosure>();
             FacetRegistry::register_impl<AGCObject, DClosure>();
             FacetRegistry::register_impl<APrintable, DClosure>();
 
+            FacetRegistry::register_impl<AGCObject, DLocalEnv>();
+            FacetRegistry::register_impl<APrintable, DLocalEnv>();
+
             // Procedure
             // +- Primitive_gco_2_gco_gco
             // \- Closure
@@ -49,6 +54,7 @@ namespace xo {
             log && log(xtag("DVsmApplyFrame.tseq", typeseq::id<DVsmApplyFrame>()));
             log && log(xtag("DVsmEvalArgsFrame.tseq", typeseq::id<DVsmEvalArgsFrame>()));
             log && log(xtag("DClosure.tseq", typeseq::id<DClosure>()));
+            log && log(xtag("DLocalEnv.tseq", typeseq::id<DLocalEnv>()));
 
             return true;
         }