0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

WFL Functions: Use isnan() instead of x != x

Browse source 
I'm sure this will make @vultraz happy!
This commit is contained in:
Celtic Minstrel 2017-04-17 02:40:15 -04:00
parent eccd3d8e7e
commit d6dddd68d2
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/formula/function.cpp
View file

@ -589,7 +589,7 @@ private:
variant execute(const formula_callable& variables, formula_debugger *fdb) const {
const double angle = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = tan(angle * pi<double>() / 180.0);
if(result != result || result <= INT_MIN || result >= INT_MAX) {
if(std::isnan(result) || result <= INT_MIN || result >= INT_MAX) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);
@ -606,7 +606,7 @@ private:
variant execute(const formula_callable& variables, formula_debugger *fdb) const {
const double num = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = asin(num) * 180.0 / pi<double>();
if(result != result) {
if(std::isnan(result)) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);
@ -622,7 +622,7 @@ private:
variant execute(const formula_callable& variables, formula_debugger *fdb) const {
const double num = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = acos(num) * 180.0 / pi<double>();
if(result != result) {
if(std::isnan(result)) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);
@ -651,7 +651,7 @@ private:
variant execute(const formula_callable& variables, formula_debugger *fdb) const {
const double num = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = sqrt(num);
if(result != result) {
if(std::isnan(result)) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);
@ -681,7 +681,7 @@ private:
const double base = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double root = args()[1]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = base < 0 && fmod(root,2) == 1 ? -pow(-base, 1.0 / root) : pow(base, 1.0 / root);
if(result != result) {
if(std::isnan(result)) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);
@ -698,14 +698,14 @@ private:
const double num = args()[0]->evaluate(variables,fdb).as_decimal() / 1000.0;
if(args().size() == 1) {
const double result = log(num);
if(result != result) {
if(std::isnan(result)) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);
} else {
const double base = args()[1]->evaluate(variables,fdb).as_decimal() / 1000.0;
const double result = log(num) / log(base);
if(result != result) {
if(std::isnan(result)) {
return variant();
}
return variant(result, variant::DECIMAL_VARIANT);