Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 300:f69e76417211
8011023: Math round didn't conform to ECMAScript 5 spec
Reviewed-by: jlaskey, attila
| author | lagergren |
|---|---|
| date | Wed, 29 May 2013 14:08:00 +0200 |
| parents | f472f7046ec9 |
| children | a2e2797392b3 |
| files | src/jdk/nashorn/internal/objects/NativeMath.java test/script/basic/JDK-8011023.js test/script/basic/JDK-8011023.js.EXPECTED |
| diffstat | 3 files changed, 41 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/nashorn/internal/objects/NativeMath.java Wed May 29 15:41:07 2013 +0530 +++ b/src/jdk/nashorn/internal/objects/NativeMath.java Wed May 29 14:08:00 2013 +0200 @@ -611,13 +611,11 @@ */ @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR) public static Object round(final Object self, final Object x) { - if (GlobalFunctions.isNaN(self, x)) { - return Double.NaN; - } else if (!GlobalFunctions.isFinite(self, x)) { - return x; + final double d = JSType.toNumber(x); + if (Math.getExponent(d) >= 52) { + return d; } - - return Math.round(JSType.toNumber(x)); + return Math.copySign(Math.floor(d + 0.5), d); } /**
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8011023.js Wed May 29 14:08:00 2013 +0200 @@ -0,0 +1,34 @@ +/* + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ + +/** + * Round should be ecma compliant + * + * @test + * @run + */ + +print(1/Math.round(-0.5)); +print(Math.round(9007199254740991)); +print(Math.round(9223372036854775807*2)); +