From 7b36a22264fe82c930d1bfdf8a678773537edb8a Mon Sep 17 00:00:00 2001
From: James Strachan <james.strachan@gmail.com>
Date: Fri, 22 Jun 2012 14:52:13 +0100
Subject: [PATCH] enabled the compiling of most of the collections based
 standard kotlin library to JavaScript

---
 .../src/org/jetbrains/k2js/config/Config.java             | 8 +-------
 libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt      | 2 +-
 libraries/tools/kotlin-js-library/pom.xml                 | 2 --
 3 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/js/js.translator/src/org/jetbrains/k2js/config/Config.java b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
index add122e82a2..3345e27227a 100644
--- a/js/js.translator/src/org/jetbrains/k2js/config/Config.java
+++ b/js/js.translator/src/org/jetbrains/k2js/config/Config.java
@@ -79,10 +79,7 @@ public abstract class Config {
      */
     @NotNull
     public static final List<String> LIB_FILE_NAMES_DEPENDENT_ON_STDLIB = Arrays.asList(
-            /**
-             TODO include ASAP...
             "/stdlib/jutil.kt",
-             */
             "/stdlib/test.kt",
             "/core/stringDefs.kt",
             "/core/strings.kt"
@@ -96,8 +93,6 @@ public abstract class Config {
     @NotNull
     public static final List<String> STDLIB_FILE_NAMES = Arrays.asList(
             "/kotlin/Preconditions.kt",
-            /*
-            TODO include ASAP - right now it generates an issue
             "/kotlin/Iterators.kt",
             "/kotlin/JUtil.kt",
             "/kotlin/JUtilCollections.kt",
@@ -105,8 +100,7 @@ public abstract class Config {
             "/kotlin/JLangIterables.kt",
             "/kotlin/JLangIterablesLazy.kt",
             "/kotlin/JLangIterablesSpecial.kt",
-            "/kotlin/support/AbstractIterator.kt"
-             */
+            "/kotlin/support/AbstractIterator.kt",
             "/kotlin/Strings.kt",
             "/kotlin/test/Test.kt"
     );
diff --git a/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt b/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt
index 2ad3a72399c..d4707acadc2 100644
--- a/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt
+++ b/libraries/stdlib/src/kotlin/JLangIterablesSpecial.kt
@@ -78,7 +78,7 @@ public fun <T> java.lang.Iterable<T>.contains(item : T) : Boolean {
   }
 
   for (var elem in this) {
-    if (elem.equals(item)) {
+    if (elem == item) {
       return true
     }
   }
diff --git a/libraries/tools/kotlin-js-library/pom.xml b/libraries/tools/kotlin-js-library/pom.xml
index 26c73414c9f..f32386fcb67 100644
--- a/libraries/tools/kotlin-js-library/pom.xml
+++ b/libraries/tools/kotlin-js-library/pom.xml
@@ -68,7 +68,6 @@
                                     </fileset>
                                     <fileset dir="${basedir}/../../stdlib/src/kotlin">
                                         <include name="Preconditions.kt"/>
-<!--
                                         <include name="Iterators.kt"/>
                                         <include name="JUtil.kt"/>
                                         <include name="JUtilCollections.kt"/>
@@ -76,7 +75,6 @@
                                         <include name="JLangIterables.kt"/>
                                         <include name="JLangIterablesLazy.kt"/>
                                         <include name="JLangIterablesSpecial.kt"/>
--->
 <!--
                                         <include name="Ordering.kt"/>
 -->