stan/jdk-24
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

8068972: Array.splice should follow the ES6 specification

Browse Source 
Reviewed-by: mhaupt, jlaskey
This commit is contained in:
Hannes Wallnöfer 2016-07-26 15:56:35 +02:00
parent 6feda5c50f
commit ffab346e43
2 changed files with 71 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
nashorn/src/jdk.scripting.nashorn/share/classes/jdk/nashorn/internal/objects/NativeArray.java
View File

@ -1329,30 +1329,31 @@ public final class NativeArray extends ScriptObject implements OptimisticBuiltin
return ScriptRuntime.UNDEFINED;
}
final Object start = args.length > 0 ? args[0] : ScriptRuntime.UNDEFINED;
final Object deleteCount = args.length > 1 ? args[1] : ScriptRuntime.UNDEFINED;
Object[] items;
if (args.length > 2) {
items = new Object[args.length - 2];
System.arraycopy(args, 2, items, 0, items.length);
} else {
items = ScriptRuntime.EMPTY_ARRAY;
}
final ScriptObject sobj = (ScriptObject)obj;
final long len = JSType.toUint32(sobj.getLength());
final long relativeStart = JSType.toLong(start);
final ScriptObject sobj = (ScriptObject)obj;
final long len = JSType.toUint32(sobj.getLength());
final long relativeStart = JSType.toLong(args.length > 0 ? args[0] : ScriptRuntime.UNDEFINED);
final long actualStart = relativeStart < 0 ? Math.max(len + relativeStart, 0) : Math.min(relativeStart, len);
final long actualDeleteCount = Math.min(Math.max(JSType.toLong(deleteCount), 0), len - actualStart);
final long actualDeleteCount;
Object[] items = ScriptRuntime.EMPTY_ARRAY;
if (args.length == 0) {
actualDeleteCount = 0;
} else if (args.length == 1) {
actualDeleteCount = len - actualStart;
} else {
actualDeleteCount = Math.min(Math.max(JSType.toLong(args[1]), 0), len - actualStart);
if (args.length > 2) {
items = new Object[args.length - 2];
System.arraycopy(args, 2, items, 0, items.length);
}
}
NativeArray returnValue;
if (actualStart <= Integer.MAX_VALUE && actualDeleteCount <= Integer.MAX_VALUE && bulkable(sobj)) {
try {
returnValue = new NativeArray(sobj.getArray().fastSplice((int)actualStart, (int)actualDeleteCount, items.length));
returnValue = new NativeArray(sobj.getArray().fastSplice((int)actualStart, (int)actualDeleteCount, items.length));
// Since this is a dense bulkable array we can use faster defineOwnProperty to copy new elements
int k = (int) actualStart;

53
nashorn/test/script/basic/JDK-8068972.js Normal file
View File

@ -0,0 +1,53 @@
/*
* Copyright (c) 2016, 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.
*/
/**
* JDK-8068972: Array.splice should follow the ES6 specification
*
* @test
* @run
*/
function assertEqualArrays(a, b) {
Assert.assertTrue(Array.isArray(a));
Assert.assertTrue(Array.isArray(b));
Assert.assertTrue(a.length === b.length);
Assert.assertTrue(a.every(function(v, j) {
return v === b[j];
}));
}
var array = [1, 2, 3, 4, 5, 6, 7];
var result = array.splice();
assertEqualArrays(array, [1, 2, 3, 4, 5, 6, 7]);
assertEqualArrays(result, []);
result = array.splice(4);
assertEqualArrays(array, [1, 2, 3, 4]);
assertEqualArrays(result, [5, 6, 7]);
result = array.splice(1, 2, -2, -3);
assertEqualArrays(array, [1, -2, -3, 4]);
assertEqualArrays(result, [2, 3]);