nf7/nf7
nf7/nf7
1
0
Fork 0
Code Issues 9 Pull Requests Projects 3 Releases 5 Wiki Activity

improve Node/ExprTk to detect input type by the value dynamically

Browse Source
This commit is contained in:
falsycat 2022-11-25 20:56:26 +09:00
parent a6fdc76333
commit c6c8bf96b6
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
file/node_exprtk.cc
View File

@ -206,18 +206,21 @@ class ExprTk::Lambda final : public nf7::Node::Lambda,
vars_.clear();
vars_.reserve(inputs.size());
for (const auto& name : f_->mem_->inputs) {
if (name.starts_with("v_")) {
auto itr = std::find_if(
inputs_.begin(), inputs_.end(), [&](auto& x) { return x.first == name; });
assert(itr != inputs_.end());
auto itr = std::find_if(
inputs_.begin(), inputs_.end(), [&](auto& x) { return x.first == name; });
assert(itr != inputs_.end());
const auto n = itr->second.tuple()->size();
const auto& v = itr->second;
if (v.isTuple()) {
const auto n = v.tuple()->size();
if (n == 0) {
throw nf7::Exception {"got empty tuple: "+name};
throw nf7::Exception {"got an empty tuple: "+name};
}
vars_.emplace_back(name, std::vector<Scalar>(n));
} else if (name.starts_with("s_")) {
} else if (v.isString()) {
vars_.emplace_back(name, std::string {});
} else {
vars_.emplace_back(name, Scalar {0});
}