Mercurial > jdk8-mips64-public > nashorn / changeset

     1.1 --- a/src/jdk/internal/dynalink/beans/BeanLinker.java	Thu Apr 03 17:35:13 2014 +0200
     1.2 +++ b/src/jdk/internal/dynalink/beans/BeanLinker.java	Mon Apr 07 21:57:33 2014 +0530
     1.3 @@ -113,6 +113,8 @@
     1.4              // explicit property is beneficial for them.
     1.5              // REVISIT: is it maybe a code smell that "dyn:getLength" is not needed?
     1.6              setPropertyGetter("length", GET_ARRAY_LENGTH, ValidationType.IS_ARRAY);
     1.7 +        } else if(List.class.isAssignableFrom(clazz)) {
     1.8 +            setPropertyGetter("length", GET_COLLECTION_LENGTH, ValidationType.INSTANCE_OF);
     1.9          }
    1.10      }
    1.11  

     2.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     2.2 +++ b/test/script/basic/JDK-8039387.js	Mon Apr 07 21:57:33 2014 +0530
     2.3 @@ -0,0 +1,39 @@
     2.4 +/*
     2.5 + * Copyright (c) 2014, 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 + * JDK-8039387: Nashorn supports indexed access of List elements, but length property is not supported
    2.29 + *
    2.30 + * @test
    2.31 + * @run
    2.32 + */
    2.33 +
    2.34 +var ArrayList = Java.type("java.util.ArrayList")
    2.35 +var list = new ArrayList(3)
    2.36 +list.add("nashorn")
    2.37 +list.add("js")
    2.38 +list.add("ecmascript")
    2.39 +var len = list.length
    2.40 +print("length = " + len)
    2.41 +for (var i = 0; i < len; i++)
    2.42 +    print(list[i])

     3.1 --- /dev/null	Thu Jan 01 00:00:00 1970 +0000
     3.2 +++ b/test/script/basic/JDK-8039387.js.EXPECTED	Mon Apr 07 21:57:33 2014 +0530
     3.3 @@ -0,0 +1,4 @@
     3.4 +length = 3
     3.5 +nashorn
     3.6 +js
     3.7 +ecmascript

     4.1 --- a/test/script/basic/list.js	Thu Apr 03 17:35:13 2014 +0200
     4.2 +++ b/test/script/basic/list.js	Mon Apr 07 21:57:33 2014 +0530
     4.3 @@ -33,7 +33,7 @@
     4.4  l.add("foo")
     4.5  l.add("bar")
     4.6  
     4.7 -print("l.length=" + l.length) // doesn't work, returns undefined
     4.8 +print("l.length=" + l.length) // works, maps to l.size()
     4.9  print("l.size()=" + l.size()) // this will work
    4.10  
    4.11  print("l[0]=" + l[0])

     5.1 --- a/test/script/basic/list.js.EXPECTED	Thu Apr 03 17:35:13 2014 +0200
     5.2 +++ b/test/script/basic/list.js.EXPECTED	Mon Apr 07 21:57:33 2014 +0530
     5.3 @@ -1,5 +1,5 @@
     5.4  l.class.name=java.util.ArrayList
     5.5 -l.length=undefined
     5.6 +l.length=2
     5.7  l.size()=2
     5.8  l[0]=foo
     5.9  l[1]=bar