vbatts/llama.cpp
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert breaking minja change

Browse source
This commit is contained in:
ochafik 2025-01-29 01:50:49 +00:00
parent 64263910d8
commit 4cdbb8c53f
1 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

10
common/minja.hpp
View file

@ -1270,11 +1270,11 @@ public:
}
auto r = right->evaluate(context);
if (op != Op::Eq && op != Op::Ne) {
if (r.is_null() || (l.is_null() && (op != Op::In && op != Op::NotIn))) {
throw std::runtime_error("unsupported operand type(s)");
}
}
// if (op != Op::Eq && op != Op::Ne) {
// if (r.is_null() || (l.is_null() && (op != Op::In && op != Op::NotIn))) {
// throw std::runtime_error("unsupported operand type(s): " + l.type() + " and " + r.type());
// }
// }
switch (op) {
case Op::StrConcat: return l.to_str() + r.to_str();
case Op::Add: return l + r;