# HG changeset patch
# User sundar
# Date 1382444276 -19800
# Node ID d04028e6b624285e4b1455d7f3a2baa750705905
# Parent f22742d5daa358a645f81c3d8294a77f2a1ec372# Parent 360761288b38f564b6fb719008a2fb712bdcffa6
Merge
diff -r f22742d5daa3 -r d04028e6b624 src/jdk/nashorn/internal/objects/NativeArray.java
--- a/src/jdk/nashorn/internal/objects/NativeArray.java Mon Oct 21 13:31:03 2013 +0400
+++ b/src/jdk/nashorn/internal/objects/NativeArray.java Tue Oct 22 17:47:56 2013 +0530
@@ -1163,12 +1163,16 @@
try {
final ScriptObject sobj = (ScriptObject)Global.toObject(self);
final long len = JSType.toUint32(sobj.getLength());
- final long n = JSType.toLong(fromIndex);
-
- if (len == 0 || n >= len) {
+ if (len == 0) {
return -1;
}
+ final long n = JSType.toLong(fromIndex);
+ if (n >= len) {
+ return -1;
+ }
+
+
for (long k = Math.max(0, (n < 0) ? (len - Math.abs(n)) : n); k < len; k++) {
if (sobj.has(k)) {
if (ScriptRuntime.EQ_STRICT(sobj.get(k), searchElement)) {
diff -r f22742d5daa3 -r d04028e6b624 src/jdk/nashorn/internal/objects/NativeString.java
--- a/src/jdk/nashorn/internal/objects/NativeString.java Mon Oct 21 13:31:03 2013 +0400
+++ b/src/jdk/nashorn/internal/objects/NativeString.java Tue Oct 22 17:47:56 2013 +0530
@@ -505,7 +505,7 @@
*/
@Function(attributes = Attribute.NOT_ENUMERABLE)
public static Object charAt(final Object self, final Object pos) {
- return charAt(self, JSType.toInteger(pos));
+ return charAtImpl(checkObjectToString(self), JSType.toInteger(pos));
}
/**
@@ -527,7 +527,10 @@
*/
@SpecializedFunction
public static String charAt(final Object self, final int pos) {
- final String str = checkObjectToString(self);
+ return charAtImpl(checkObjectToString(self), pos);
+ }
+
+ private static String charAtImpl(final String str, final int pos) {
return (pos < 0 || pos >= str.length()) ? "" : String.valueOf(str.charAt(pos));
}
@@ -539,7 +542,7 @@
*/
@Function(attributes = Attribute.NOT_ENUMERABLE)
public static Object charCodeAt(final Object self, final Object pos) {
- return charCodeAt(self, JSType.toInteger(pos));
+ return charCodeAtImpl(checkObjectToString(self), JSType.toInteger(pos));
}
/**
@@ -561,7 +564,10 @@
*/
@SpecializedFunction
public static double charCodeAt(final Object self, final int pos) {
- final String str = checkObjectToString(self);
+ return charCodeAtImpl(checkObjectToString(self), pos);
+ }
+
+ private static double charCodeAtImpl(final String str, final int pos) {
return (pos < 0 || pos >= str.length()) ? Double.NaN : str.charAt(pos);
}
diff -r f22742d5daa3 -r d04028e6b624 src/jdk/nashorn/internal/runtime/ScriptRuntime.java
--- a/src/jdk/nashorn/internal/runtime/ScriptRuntime.java Mon Oct 21 13:31:03 2013 +0400
+++ b/src/jdk/nashorn/internal/runtime/ScriptRuntime.java Tue Oct 22 17:47:56 2013 +0530
@@ -47,6 +47,7 @@
import jdk.nashorn.api.scripting.ScriptObjectMirror;
import jdk.nashorn.internal.codegen.CompilerConstants.Call;
import jdk.nashorn.internal.ir.debug.JSONWriter;
+import jdk.nashorn.internal.objects.Global;
import jdk.nashorn.internal.parser.Lexer;
import jdk.nashorn.internal.runtime.linker.Bootstrap;
@@ -258,6 +259,11 @@
return ((Map)obj).keySet().iterator();
}
+ final Object wrapped = Global.instance().wrapAsObject(obj);
+ if (wrapped instanceof ScriptObject) {
+ return ((ScriptObject)wrapped).propertyIterator();
+ }
+
return Collections.emptyIterator();
}
@@ -336,6 +342,11 @@
return ((Iterable)obj).iterator();
}
+ final Object wrapped = Global.instance().wrapAsObject(obj);
+ if (wrapped instanceof ScriptObject) {
+ return ((ScriptObject)wrapped).valueIterator();
+ }
+
return Collections.emptyIterator();
}
diff -r f22742d5daa3 -r d04028e6b624 src/overview.html
--- a/src/overview.html Mon Oct 21 13:31:03 2013 +0400
+++ b/src/overview.html Tue Oct 22 17:47:56 2013 +0530
@@ -108,6 +108,6 @@
Other non-standard built-in objects
In addition to {@code Java}, Nashorn also exposes some other non-standard built-in objects:
{@code JSAdapter},
-{@code JavaImporter},
+{@code JavaImporter},
{@code Packages}.
diff -r f22742d5daa3 -r d04028e6b624 test/script/basic/JDK-8026955.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8026955.js Tue Oct 22 17:47:56 2013 +0530
@@ -0,0 +1,51 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8026955: for-in should convert primitive values to object
+ *
+ * @test
+ * @run
+ */
+
+Object.prototype[4] = "world";
+String.prototype[3] = "hello";
+Number.prototype[3] = "hello";
+Boolean.prototype[3] = "hello";
+
+function testForIn(x) {
+ for (var i in x) {
+ print(i, x[i]);
+ }
+ for each (var i in x) {
+ print(i);
+ }
+}
+
+testForIn("abc");
+testForIn(false);
+testForIn(3);
+testForIn(null);
+testForIn();
+testForIn(String.prototype);
+
diff -r f22742d5daa3 -r d04028e6b624 test/script/basic/JDK-8026955.js.EXPECTED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8026955.js.EXPECTED Tue Oct 22 17:47:56 2013 +0530
@@ -0,0 +1,22 @@
+0 a
+1 b
+2 c
+3 hello
+4 world
+a
+b
+c
+hello
+world
+3 hello
+4 world
+hello
+world
+3 hello
+4 world
+hello
+world
+3 hello
+4 world
+hello
+world
diff -r f22742d5daa3 -r d04028e6b624 test/script/basic/JDK-8027016.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8027016.js Tue Oct 22 17:47:56 2013 +0530
@@ -0,0 +1,42 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8027016: Array.prototype.indexOf should return -1 when array is of length zero
+ *
+ * @test
+ * @run
+ */
+
+var res = [].indexOf(null, {valueOf:function(){throw "not reached"}});
+if (res != -1) {
+ fail("expected -1 on indexOf on empty array");
+}
+
+// add index beyond length check as well
+
+res = [].indexOf(null, 1);
+if (res != -1) {
+ fail("expected -1 on indexOf on empty array");
+}
+
diff -r f22742d5daa3 -r d04028e6b624 test/script/basic/JDK-8027024.js
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8027024.js Tue Oct 22 17:47:56 2013 +0530
@@ -0,0 +1,58 @@
+/*
+ * 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.
+ */
+
+/**
+ * JDK-8027024: String.prototype.charAt and charCodeAt do not evaluate 'self' and 'pos' arguments in right order
+ *
+ * @test
+ * @run
+ */
+
+
+String.prototype.charAt.call(
+ {
+ toString: function() {
+ print("charAt.self.toString");
+ }
+ },
+
+ {
+ valueOf: function() {
+ print("charAt.pos.valueOf");
+ }
+ }
+);
+
+String.prototype.charCodeAt.call(
+ {
+ toString: function() {
+ print("charCodeAt.self.toString");
+ }
+ },
+
+ {
+ valueOf: function() {
+ print("charCodeAt.pos.valueOf");
+ }
+ }
+);
diff -r f22742d5daa3 -r d04028e6b624 test/script/basic/JDK-8027024.js.EXPECTED
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/test/script/basic/JDK-8027024.js.EXPECTED Tue Oct 22 17:47:56 2013 +0530
@@ -0,0 +1,4 @@
+charAt.self.toString
+charAt.pos.valueOf
+charCodeAt.self.toString
+charCodeAt.pos.valueOf
diff -r f22742d5daa3 -r d04028e6b624 test/script/basic/NASHORN-397.js
--- a/test/script/basic/NASHORN-397.js Mon Oct 21 13:31:03 2013 +0400
+++ b/test/script/basic/NASHORN-397.js Tue Oct 22 17:47:56 2013 +0530
@@ -35,11 +35,8 @@
fail("typeof(5).x is not 'number'");
}
-// It is function because PrintStream implements Closeable, which is
-// marked with @FunctionalInterface. Yes, this means calling a stream
-// like "stream()" closes it.
-if (typeof (java.lang.System.out) != 'function') {
- fail("typeof java.lang.System.out is not 'object'");
+if (typeof (java.net.Proxy.NO_PROXY) != 'object') {
+ fail("typeof java.net.Proxy.NO_PROXY is not 'object'");
}
if (typeof (java.lang.Math.PI) != 'number') {