xo-expression2 xo-procedure2: work on calling primitive for x*y

xo-expression2/include/xo/expression2/DApplyExpr.hpp

@@ -20,18 +20,55 @@ namespace xo {
          **/
         class DApplyExpr {
         public:
+            using AAllocator = xo::mm::AAllocator;
             using TypeDescr = xo::reflect::TypeDescr;
             using ppindentinfo = xo::print::ppindentinfo;
-            using size_type = std::size_t;
+            using size_type = std::uint32_t;
 
         public:
+            /** @defgroup scm-applyexpr-constructors **/
+            ///@{
+
+            /** construct empty instance, but with argument expressions empty **/
+            DApplyExpr(TypeRef typeref,
+                       obj<AExpression> fn_expr,
+                       size_type n_args);
+
+            /** create apply for function with 2 arguments **/
+            static obj<AExpression,DApplyExpr> make2(obj<AAllocator> mm,
+                                                     TypeRef typeref,
+                                                     obj<AExpression> fn_expr,
+                                                     obj<AExpression> arg1,
+                                                     obj<AExpression> arg2);
+
+            /** create apply for function with 2 arguments **/
+            static DApplyExpr * _make2(obj<AAllocator> mm,
+                                       TypeRef typeref,
+                                       obj<AExpression> fn_expr,
+                                       obj<AExpression> arg1,
+                                       obj<AExpression> arg2);
+
+            /** scaffold incomplete instance.
+             *  apply-expr using memory from @p mm.
+             *  will construct instance with space for @p n_args arguments
+             *  but expressions left empty.
+             *  use @ref assign_arg for all arguments to complete.
+             **/
+            static DApplyExpr * scaffold(obj<AAllocator> mm,
+                                         TypeRef typeref,
+                                         obj<AExpression> fn_expr,
+                                         size_type n_args);
+            void assign_arg(size_type i_arg, obj<AExpression> expr);
+
+            ///@}
+            /** @defgroup scm-applyexpr-access-methods **/
+            ///@{
 
             obj<AExpression>  fn() const noexcept { return fn_; }
-            const DArray * args() const noexcept { return args_; }
-
-            size_type n_arg() const noexcept { return args_->size(); }
+            size_type n_args() const noexcept { return n_args_; }
             obj<AExpression> arg(size_type i) const;
 
+            ///@}
             /** @defgroup scm-applyexpr-expression-facet **/
             ///@{
 
@@ -40,6 +77,12 @@ namespace xo {
             TypeDescr valuetype() const noexcept { return typeref_.td(); }
             void assign_valuetype(TypeDescr td) noexcept;
 
+            ///@}
+            /** @defgroup scm-applyexpr-gcobject-facet **/
+            ///@{
+
+            // shallow_copy() etc.
+
             ///@}
             /** @defgroup scm-applyexpr-printable-facet **/
             ///@{
@@ -55,8 +98,10 @@ namespace xo {
             TypeRef typeref_;
             /** expression for function/procedure to invoke **/
             obj<AExpression> fn_;
-            /** expression for each argument vector **/
-            const DArray * args_;
+            /** number of arguments (not counting @ref fn_ **/
+            size_type n_args_ = 0;
+            /** args_[i] is expression for i'th argument to @ref fn_ **/
+            obj<AExpression> args_[];
         };
     }
 }

xo-expression2/include/xo/expression2/detail/IExpression_DApplyExpr.hpp

@@ -0,0 +1,66 @@
+/** @file IExpression_DApplyExpr.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/IExpression_DApplyExpr.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_repr.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/IExpression_DApplyExpr.json5]
+ **/
+
+#pragma once
+
+#include "Expression.hpp"
+#include "Expression.hpp"
+#include "DApplyExpr.hpp"
+
+namespace xo { namespace scm { class IExpression_DApplyExpr; } }
+
+namespace xo {
+    namespace facet {
+        template <>
+        struct FacetImplementation<xo::scm::AExpression,
+                                   xo::scm::DApplyExpr>
+        {
+            using ImplType = xo::scm::IExpression_Xfer
+              <xo::scm::DApplyExpr,
+               xo::scm::IExpression_DApplyExpr>;
+        };
+    }
+}
+
+namespace xo {
+    namespace scm {
+        /** @class IExpression_DApplyExpr
+         **/
+        class IExpression_DApplyExpr {
+        public:
+            /** @defgroup scm-expression-dapplyexpr-type-traits **/
+            ///@{
+            using TypeDescr = xo::scm::AExpression::TypeDescr;
+            using Copaque = xo::scm::AExpression::Copaque;
+            using Opaque = xo::scm::AExpression::Opaque;
+            ///@}
+            /** @defgroup scm-expression-dapplyexpr-methods **/
+            ///@{
+            // const methods
+            /** expression type (constant | apply | ..) **/
+            static exprtype extype(const DApplyExpr & self) noexcept;
+            /** placeholder for type giving possible values for this expression **/
+            static TypeRef typeref(const DApplyExpr & self) noexcept;
+            /** type giving possible values for this expression. Maybe null before typecheck **/
+            static TypeDescr valuetype(const DApplyExpr & self) noexcept;
+
+            // non-const methods
+            /** assing to valuetype member. Useful when scaffolding expressions **/
+            static void assign_valuetype(DApplyExpr & self, TypeDescr td) noexcept;
+            ///@}
+        };
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end */

xo-expression2/include/xo/expression2/detail/IPrintable_DApplyExpr.hpp

@@ -0,0 +1,62 @@
+/** @file IPrintable_DApplyExpr.hpp
+ *
+ *  Generated automagically from ingredients:
+ *  1. code generator:
+ *       [/home/roland/proj/xo-umbrella2-claude1/xo-facet/codegen/genfacet]
+ *     arguments:
+ *       --input [idl/IPrintable_DApplyExpr.json5]
+ *  2. jinja2 template for abstract facet .hpp file:
+ *       [iface_facet_repr.hpp.j2]
+ *  3. idl for facet methods
+ *       [idl/IPrintable_DApplyExpr.json5]
+ **/
+
+#pragma once
+
+#include "Printable.hpp"
+#include <xo/printable2/Printable.hpp>
+#include <xo/printable2/detail/IPrintable_Xfer.hpp>
+#include "DApplyExpr.hpp"
+
+namespace xo { namespace scm { class IPrintable_DApplyExpr; } }
+
+namespace xo {
+    namespace facet {
+        template <>
+        struct FacetImplementation<xo::print::APrintable,
+                                   xo::scm::DApplyExpr>
+        {
+            using ImplType = xo::print::IPrintable_Xfer
+              <xo::scm::DApplyExpr,
+               xo::scm::IPrintable_DApplyExpr>;
+        };
+    }
+}
+
+namespace xo {
+    namespace scm {
+        /** @class IPrintable_DApplyExpr
+         **/
+        class IPrintable_DApplyExpr {
+        public:
+            /** @defgroup scm-printable-dapplyexpr-type-traits **/
+            ///@{
+            using ppindentinfo = xo::print::APrintable::ppindentinfo;
+            using Copaque = xo::print::APrintable::Copaque;
+            using Opaque = xo::print::APrintable::Opaque;
+            ///@}
+            /** @defgroup scm-printable-dapplyexpr-methods **/
+            ///@{
+            // const methods
+            /** Pretty-printing support for this object.
+See [xo-indentlog/xo/indentlog/pretty.hpp] **/
+            static bool pretty(const DApplyExpr & self, const ppindentinfo & ppii);
+
+            // non-const methods
+            ///@}
+        };
+
+    } /*namespace scm*/
+} /*namespace xo*/
+
+/* end */