idealirc
/
idealirc
1
Fork 0
Code Issues 13 Pull Requests Projects Releases 2 Wiki Activity

#118 Fixed a bug in script engine with logical operators.

Browse Source
master
Tomatix 3 years ago
parent 147d8b5905
commit 02e09bccb6
1 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 4
      Script/ValueHolder.cpp

4
Script/ValueHolder.cpp
Unescape View File

@ -527,7 +527,7 @@ bool ValueHolder::logicOperator(ParserOperator op, const ValueHolder& other) con
ret = intOp(mv_i, std::get<int>(*other.mval())); ret = intOp(mv_i, std::get<int>(*other.mval()));
else if (otherType == Type::Real) else if (otherType == Type::Real)
ret = realOp(static_cast<double>(mv_i), std::get<double>(*other.mval())); // TODO use some comparison with an epsilon value ret = realOp(static_cast<double>(mv_i), std::get<double>(*other.mval())); // TODO use some comparison with an epsilon value
if (otherType == Type::Bool) else if (otherType == Type::Bool)
ret = boolOp(mv_i, std::get<bool>(*other.mval())); ret = boolOp(mv_i, std::get<bool>(*other.mval()));
else if (otherType == Type::Void) else if (otherType == Type::Void)
ret = 0; ret = 0;
@ -594,7 +594,7 @@ bool ValueHolder::logicOperator(ParserOperator op, const ValueHolder& other) con
ret = stringOpL(mv_s, std::get<int>(*other.mval())); ret = stringOpL(mv_s, std::get<int>(*other.mval()));
else if (otherType == Type::Real) else if (otherType == Type::Real)
ret = stringOpL(mv_s, std::get<double>(*other.mval()) != 0); // TODO use some comparison with an epsilon value ret = stringOpL(mv_s, std::get<double>(*other.mval()) != 0); // TODO use some comparison with an epsilon value
if (otherType == Type::Bool) else if (otherType == Type::Bool)
ret = boolOp(!mv_s.empty(), std::get<bool>(*other.mval())); ret = boolOp(!mv_s.empty(), std::get<bool>(*other.mval()));
else if (otherType == Type::Void) else if (otherType == Type::Void)
ret = 0; ret = 0;

Write Preview
Loading…
Cancel
Save