Eatswap
/
DragonLisp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: loop does not eval, use accumulate instead of reduce

This commit is contained in:
Eatswap 2022-12-13 15:50:10 +08:00
parent cec9e7945c
commit 81add324bb
Signed by: Eatswap
GPG Key ID: BE661106A1F3FA0B
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
AST.cpp
View File

@ -143,6 +143,7 @@ std::shared_ptr<Value> LoopAST::eval(Context* parent) {
continue; continue;
if (ptr->getType() == T_ReturnAST) if (ptr->getType() == T_ReturnAST)
return ptr->eval(parent); return ptr->eval(parent);
stmt->eval(parent);
} }
} }
} else { } else {
@ -165,6 +166,7 @@ std::shared_ptr<Value> LoopAST::eval(Context* parent) {
continue; continue;
if (ptr->getType() == T_ReturnAST) if (ptr->getType() == T_ReturnAST)
return ptr->eval(ctx.get()); return ptr->eval(ctx.get());
stmt->eval(ctx.get());
} }
} }
} }
@ -334,7 +336,7 @@ std::shared_ptr<Value> ListAST::eval(Context* parent) {
std::transform(vals2.begin(), vals2.end(), std::back_inserter(intVal), [&](std::shared_ptr<SingleValue>& ptr) { std::transform(vals2.begin(), vals2.end(), std::back_inserter(intVal), [&](std::shared_ptr<SingleValue>& ptr) {
return ptr->getInt(); return ptr->getInt();
}); });
return std::make_shared<SingleValue>(std::reduce(intVal.begin() + 1, intVal.end(), intVal[0], [this](std::int64_t x, std::int64_t y) { return std::make_shared<SingleValue>(std::accumulate(intVal.begin() + 1, intVal.end(), intVal[0], [this](std::int64_t x, std::int64_t y) {
switch (this->op) { switch (this->op) {
case LOGAND: case LOGAND:
return x & y; return x & y;
@ -386,12 +388,12 @@ std::shared_ptr<Value> ListAST::eval(Context* parent) {
std::transform(vals2.begin(), vals2.end(), std::back_inserter(floatVal), [&](std::shared_ptr<SingleValue>& ptr) { std::transform(vals2.begin(), vals2.end(), std::back_inserter(floatVal), [&](std::shared_ptr<SingleValue>& ptr) {
return (ptr->isFloat() ? ptr->getFloat() : ptr->getInt()); return (ptr->isFloat() ? ptr->getFloat() : ptr->getInt());
}); });
return std::make_shared<SingleValue>(std::reduce(floatVal.begin() + 1, floatVal.end(), floatVal[0], opFunc)); return std::make_shared<SingleValue>(std::accumulate(floatVal.begin() + 1, floatVal.end(), floatVal[0], opFunc));
} else { } else {
std::transform(vals2.begin(), vals2.end(), std::back_inserter(intVal), [&](std::shared_ptr<SingleValue>& ptr) { std::transform(vals2.begin(), vals2.end(), std::back_inserter(intVal), [&](std::shared_ptr<SingleValue>& ptr) {
return ptr->getInt(); return ptr->getInt();
}); });
return std::make_shared<SingleValue>(std::reduce(intVal.begin() + 1, intVal.end(), intVal[0], opFunc)); return std::make_shared<SingleValue>(std::accumulate(intVal.begin() + 1, intVal.end(), intVal[0], opFunc));
} }
} }