more of the stdlib compiling to JS

js/js.libraries/src/core/javautil.kt

@@ -21,7 +21,6 @@ public trait Iterator<T> {
     open fun remove() : Unit = js.noImpl
 }
 
-library
 val Collections = object {
     library("collectionsMax")
     public fun max<T>(col : Collection<T>, comp : Comparator<T>) : T = js.noImpl

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibTestToJSTest.java

@@ -39,6 +39,7 @@ public class StdLibTestToJSTest extends StdLibTestSupport {
 
         generateJavaScriptFiles(EcmaVersion.all(),
                                 "libraries/stdlib/test",
+                                "ListTest.kt",
                                 "StringTest.kt",
                                 "js/SimpleTest.kt");
     }

js/js.tests/test/org/jetbrains/k2js/test/semantics/StdLibToJSTest.java

@@ -40,8 +40,7 @@ public class StdLibToJSTest extends StdLibTestSupport {
         generateJavaScriptFiles(EcmaVersion.all(),
                                 "libraries/stdlib/src",
                                 "kotlin/Preconditions.kt",
-                                // TODO re-enable when we've got the filter stuff ported to JS
+                                "kotlin/dom/Dom.kt",
-                                //"kotlin/dom/Dom.kt",
                                 "kotlin/support/AbstractIterator.kt");
     }
 }

libraries/stdlib/src/kotlin/dom/Dom.kt

@@ -11,6 +11,9 @@ import java.lang.IndexOutOfBoundsException
 
 // Properties
 
+private val EmptyElementList: List<Element> = Collections.emptyList<Element>()!!
+private val EmptyNodeList: List<Node> = Collections.emptyList<Node>()!!
+
 var Node.text : String
 get() {
     return textContent
@@ -120,8 +123,7 @@ inline fun Document?.elements(namespaceUri: String, localName: String): List<Ele
 inline fun NodeList?.toList(): List<Node> {
     return if (this == null) {
         // TODO the following is easier to convert to JS
-        //Collections.EMPTY_LIST as List<Node>
+        EmptyNodeList
-        ArrayList<Node>()
     }
     else {
         NodeListAsList(this)
@@ -131,7 +133,7 @@ inline fun NodeList?.toList(): List<Node> {
 inline fun NodeList?.toElementList(): List<Element> {
     return if (this == null) {
         // TODO the following is easier to convert to JS
-        //Collections.EMPTY_LIST as List<Element>
+        //EmptyElementList
         ArrayList<Element>()
     }
     else {
@@ -153,13 +155,13 @@ fun Document?.get(selector: String): List<Element> {
             return if (element != null)
                 arrayList<Element>(element)
             else
-                Collections.EMPTY_LIST as List<Element>
+                EmptyElementList
         } else {
             //  assume its a vanilla element name
             elements(selector)
         }
     } else {
-        Collections.EMPTY_LIST as List<Element>
+        EmptyElementList
     }
 }
 
@@ -174,7 +176,7 @@ fun Element.get(selector: String): List<Element> {
         return if (element != null)
             arrayList<Element>(element)
         else
-            Collections.EMPTY_LIST as List<Element>
+            EmptyElementList
     } else {
         //  assume its a vanilla element name
         elements(selector)

libraries/tools/kotlin-js-library/pom.xml

@@ -53,12 +53,10 @@
                                     </fileset>
                                 </copy>
                                 <copy todir="${basedir}/target/generated-js-library/kotlin">
-<!--
                                     <fileset dir="${basedir}/../../stdlib/src/kotlin/dom">
                                         <include name="**/*.kt"/>
                                         <exclude name="**/*JVM.kt"/>
                                     </fileset>
--->
                                     <fileset dir="${basedir}/../../stdlib/src/kotlin/support">
                                         <include name="**/*.kt"/>
                                         <exclude name="**/*JVM.kt"/>