Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/nashorn/internal/objects/NativeMath.java	Wed May 29 15:41:07 2013 +0530
     1.2 +++ b/src/jdk/nashorn/internal/objects/NativeMath.java	Wed May 29 14:08:00 2013 +0200
     1.3 @@ -611,13 +611,11 @@
     1.4       */
     1.5      @Function(attributes = Attribute.NOT_ENUMERABLE, where = Where.CONSTRUCTOR)
     1.6      public static Object round(final Object self, final Object x) {
     1.7 -        if (GlobalFunctions.isNaN(self, x)) {
     1.8 -            return Double.NaN;
     1.9 -        } else if (!GlobalFunctions.isFinite(self, x)) {
    1.10 -            return x;
    1.11 +        final double d = JSType.toNumber(x);
    1.12 +        if (Math.getExponent(d) >= 52) {
    1.13 +            return d;
    1.14          }
    1.15 -
    1.16 -        return Math.round(JSType.toNumber(x));
    1.17 +        return Math.copySign(Math.floor(d + 0.5), d);
    1.18      }
    1.19  
    1.20      /**

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8011023.js	Wed May 29 14:08:00 2013 +0200
     2.3 @@ -0,0 +1,34 @@
     2.4 +/*
     2.5 + * Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
     2.6 + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
     2.7 + * 
     2.8 + * This code is free software; you can redistribute it and/or modify it
     2.9 + * under the terms of the GNU General Public License version 2 only, as
    2.10 + * published by the Free Software Foundation.
    2.11 + * 
    2.12 + * This code is distributed in the hope that it will be useful, but WITHOUT
    2.13 + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
    2.14 + * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
    2.15 + * version 2 for more details (a copy is included in the LICENSE file that
    2.16 + * accompanied this code).
    2.17 + * 
    2.18 + * You should have received a copy of the GNU General Public License version
    2.19 + * 2 along with this work; if not, write to the Free Software Foundation,
    2.20 + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2.21 + * 
    2.22 + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
    2.23 + * or visit www.oracle.com if you need additional information or have any
    2.24 + * questions.
    2.25 + */
    2.26 +
    2.27 +/**
    2.28 + * Round should be ecma compliant
    2.29 + *
    2.30 + * @test
    2.31 + * @run 
    2.32 + */
    2.33 +
    2.34 +print(1/Math.round(-0.5));
    2.35 +print(Math.round(9007199254740991));
    2.36 +print(Math.round(9223372036854775807*2));
    2.37 +

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8011023.js.EXPECTED	Wed May 29 14:08:00 2013 +0200
     3.3 @@ -0,0 +1,3 @@
     3.4 +-Infinity
     3.5 +9007199254740991
     3.6 +18446744073709552000