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

xo-expression: use Reflect::require_function() for precision

Browse source
This commit is contained in:
Roland Conybeare 2024-06-17 12:25:12 -04:00
commit 6783cb7e8c
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
include/xo/expression/Lambda.hpp
View file

@ -35,6 +35,9 @@ namespace xo {
const std::vector<std::string> & argv() const { return argv_; }
const ref::rp<Expression> & body() const { return body_; }
/** return number of arguments expected by this function **/
int n_arg() const { return argv_.size(); }
// ----- Expression -----
virtual void display(std::ostream & os) const override;

13
include/xo/expression/Primitive.hpp
View file

@ -33,17 +33,20 @@ namespace xo {
FunctionPointer fnptr)
: PrimitiveInterface(),
name_{name},
value_td_{Reflect::require<FunctionPointer>()},
value_td_{Reflect::require_function<FunctionPointer>()},
value_{fnptr}
{}
{
if (!value_td_->is_function())
throw std::runtime_error("Primitive: expected function pointer");
if (!value_td_->fn_retval())
throw std::runtime_error("Primitive: expected non-null function return value");
}
FunctionPointer value() const { return value_; }
// ----- PrimitiveInterface -----
virtual std::string const & name() const { return name_; }
/** FIXME for now **/
virtual int n_arg() const { return 1; }
virtual std::string const & name() const override { return name_; }
// ----- ConstantInterface -----

4
include/xo/expression/PrimitiveInterface.hpp
View file

@ -22,7 +22,9 @@ namespace xo {
}
virtual const std::string & name() const = 0;
virtual int n_arg() const = 0;
int n_arg() const { return this->value_td()->n_fn_arg(); }
TypeDescr fn_retval() const { return this->value_td()->fn_retval(); }
TypeDescr fn_arg(uint32_t i) const { return this->value_td()->fn_arg(i); }
//virtual TypeDescr value_td() const override = 0;
//virtual TaggedPtr value_tp() const override = 0;