enabled the compiling of most of the collections based standard kotlin library to JavaScript

This commit is contained in:
James Strachan
2012-06-22 14:52:13 +01:00
parent 43b78649f3
commit 7b36a22264
3 changed files with 2 additions and 10 deletions
@@ -79,10 +79,7 @@ public abstract class Config {
*/ */
@NotNull @NotNull
public static final List<String> LIB_FILE_NAMES_DEPENDENT_ON_STDLIB = Arrays.asList( public static final List<String> LIB_FILE_NAMES_DEPENDENT_ON_STDLIB = Arrays.asList(
/**
TODO include ASAP...
"/stdlib/jutil.kt", "/stdlib/jutil.kt",
*/
"/stdlib/test.kt", "/stdlib/test.kt",
"/core/stringDefs.kt", "/core/stringDefs.kt",
"/core/strings.kt" "/core/strings.kt"
@@ -96,8 +93,6 @@ public abstract class Config {
@NotNull @NotNull
public static final List<String> STDLIB_FILE_NAMES = Arrays.asList( public static final List<String> STDLIB_FILE_NAMES = Arrays.asList(
"/kotlin/Preconditions.kt", "/kotlin/Preconditions.kt",
/*
TODO include ASAP - right now it generates an issue
"/kotlin/Iterators.kt", "/kotlin/Iterators.kt",
"/kotlin/JUtil.kt", "/kotlin/JUtil.kt",
"/kotlin/JUtilCollections.kt", "/kotlin/JUtilCollections.kt",
@@ -105,8 +100,7 @@ public abstract class Config {
"/kotlin/JLangIterables.kt", "/kotlin/JLangIterables.kt",
"/kotlin/JLangIterablesLazy.kt", "/kotlin/JLangIterablesLazy.kt",
"/kotlin/JLangIterablesSpecial.kt", "/kotlin/JLangIterablesSpecial.kt",
"/kotlin/support/AbstractIterator.kt" "/kotlin/support/AbstractIterator.kt",
*/
"/kotlin/Strings.kt", "/kotlin/Strings.kt",
"/kotlin/test/Test.kt" "/kotlin/test/Test.kt"
); );
@@ -78,7 +78,7 @@ public fun <T> java.lang.Iterable<T>.contains(item : T) : Boolean {
} }
for (var elem in this) { for (var elem in this) {
if (elem.equals(item)) { if (elem == item) {
return true return true
} }
} }
@@ -68,7 +68,6 @@
</fileset> </fileset>
<fileset dir="${basedir}/../../stdlib/src/kotlin"> <fileset dir="${basedir}/../../stdlib/src/kotlin">
<include name="Preconditions.kt"/> <include name="Preconditions.kt"/>
<!--
<include name="Iterators.kt"/> <include name="Iterators.kt"/>
<include name="JUtil.kt"/> <include name="JUtil.kt"/>
<include name="JUtilCollections.kt"/> <include name="JUtilCollections.kt"/>
@@ -76,7 +75,6 @@
<include name="JLangIterables.kt"/> <include name="JLangIterables.kt"/>
<include name="JLangIterablesLazy.kt"/> <include name="JLangIterablesLazy.kt"/>
<include name="JLangIterablesSpecial.kt"/> <include name="JLangIterablesSpecial.kt"/>
-->
<!-- <!--
<include name="Ordering.kt"/> <include name="Ordering.kt"/>
--> -->