Mercurial > people > rkennke > jdk9-shenandoah-final > nashorn
changeset 782:05660ace537a
8039387: Nashorn supports indexed access of List elements, but length property is not supported
Reviewed-by: lagergren, jlaskey
| author | sundar |
|---|---|
| date | Mon, 07 Apr 2014 21:57:33 +0530 |
| parents | fe83c744a45c |
| children | 37d6d1a120b5 |
| files | src/jdk/internal/dynalink/beans/BeanLinker.java test/script/basic/JDK-8039387.js test/script/basic/JDK-8039387.js.EXPECTED test/script/basic/list.js test/script/basic/list.js.EXPECTED |
| diffstat | 5 files changed, 47 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/jdk/internal/dynalink/beans/BeanLinker.java Thu Apr 03 17:35:13 2014 +0200 +++ b/src/jdk/internal/dynalink/beans/BeanLinker.java Mon Apr 07 21:57:33 2014 +0530 @@ -113,6 +113,8 @@ // explicit property is beneficial for them. // REVISIT: is it maybe a code smell that "dyn:getLength" is not needed? setPropertyGetter("length", GET_ARRAY_LENGTH, ValidationType.IS_ARRAY); + } else if(List.class.isAssignableFrom(clazz)) { + setPropertyGetter("length", GET_COLLECTION_LENGTH, ValidationType.INSTANCE_OF); } }
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8039387.js Mon Apr 07 21:57:33 2014 +0530 @@ -0,0 +1,39 @@ +/* + * Copyright (c) 2014, 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-8039387: Nashorn supports indexed access of List elements, but length property is not supported + * + * @test + * @run + */ + +var ArrayList = Java.type("java.util.ArrayList") +var list = new ArrayList(3) +list.add("nashorn") +list.add("js") +list.add("ecmascript") +var len = list.length +print("length = " + len) +for (var i = 0; i < len; i++) + print(list[i])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/test/script/basic/JDK-8039387.js.EXPECTED Mon Apr 07 21:57:33 2014 +0530 @@ -0,0 +1,4 @@ +length = 3 +nashorn +js +ecmascript
--- a/test/script/basic/list.js Thu Apr 03 17:35:13 2014 +0200 +++ b/test/script/basic/list.js Mon Apr 07 21:57:33 2014 +0530 @@ -33,7 +33,7 @@ l.add("foo") l.add("bar") -print("l.length=" + l.length) // doesn't work, returns undefined +print("l.length=" + l.length) // works, maps to l.size() print("l.size()=" + l.size()) // this will work print("l[0]=" + l[0])