archive-gh-me/jerryscript
1
0
Fork 0
mirror of https://github.com/jerryscript-project/jerryscript.git synced 2025-12-15 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Improve Infinity handling in Math.min/max methods.

Browse Source 
In Math.max case: if we already found an infinity value update the result
only when the previous value was a negative infinity.

In Math.min case: if we already found an infinity value update the result
only when the previous value was a positive infinity.

JerryScript-DCO-1.0-Signed-off-by: Peter Gal pgal.u-szeged@partner.samsung.com
This commit is contained in:
Peter Gal 2015-07-22 16:08:29 +02:00
parent 3c71daaf84
commit b5de03a808
3 changed files with 30 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jerry-core/ecma/builtin-objects/ecma-builtin-math.cpp
View File

@ -362,11 +362,12 @@ ecma_builtin_math_object_max (ecma_value_t this_arg __attr_unused___, /**< 'this
ret_num = arg_num;
}
}
else if (ecma_number_is_infinity (ret_num)) /* ret_num is negative infinity */
else if (ecma_number_is_infinity (ret_num))
{
JERRY_ASSERT (ecma_number_is_negative (ret_num));
ret_num = arg_num;
if (ecma_number_is_negative (ret_num))
{
ret_num = arg_num;
}
}
else
{
@ -443,11 +444,12 @@ ecma_builtin_math_object_min (ecma_value_t this_arg __attr_unused___, /**< 'this
ret_num = arg_num;
}
}
else if (ecma_number_is_infinity (ret_num)) /* ret_num is positive infinity */
else if (ecma_number_is_infinity (ret_num))
{
JERRY_ASSERT (!ecma_number_is_negative (ret_num));
ret_num = arg_num;
if (!ecma_number_is_negative (ret_num))
{
ret_num = arg_num;
}
}
else
{

10
tests/jerry/math-max.js
View File

@ -27,3 +27,13 @@ assert(Math['max'] () === -Infinity);
assert(Math['max'] (0.0, -0.0) === 0.0);
assert(Math['max'] (-0.0, 0.0) === 0.0);
assert(Math['max'] (2, Infinity) === Infinity);
assert(Math['max'] (Infinity, 2) === Infinity);
assert(Math['max'] (2, -Infinity) === 2);
assert(Math['max'] (-Infinity, 2) === 2);
assert(Math['max'] (-2, Infinity) === Infinity);
assert(Math['max'] (Infinity, -2) === Infinity);
assert(Math['max'] (-2, -Infinity) === -2);
assert(Math['max'] (-Infinity, -2) === -2);

10
tests/jerry/math-min.js vendored
View File

@ -27,3 +27,13 @@ assert(Math['min'] () === Infinity);
assert(Math['min'] (0.0, -0.0) === -0.0);
assert(Math['min'] (-0.0, 0.0) === -0.0);
assert(Math['min'] (2, -Infinity) === -Infinity);
assert(Math['min'] (-Infinity, 2) === -Infinity);
assert(Math['min'] (2, Infinity) === 2);
assert(Math['min'] (Infinity, 2) === 2);
assert(Math['min'] (-2, Infinity) === -2);
assert(Math['min'] (Infinity, -2) === -2);
assert(Math['min'] (-2, -Infinity) === -Infinity);
assert(Math['min'] (-Infinity, -2) === -Infinity);