diff --git a/js/js.translator/testData/expression/misc/cases/KT-2314.kt b/js/js.translator/testData/expression/misc/cases/KT-2314.kt index 46fb084ef52..b84258b1dc7 100644 --- a/js/js.translator/testData/expression/misc/cases/KT-2314.kt +++ b/js/js.translator/testData/expression/misc/cases/KT-2314.kt @@ -11,7 +11,7 @@ fun box(): Boolean { } -public inline fun arrayList(vararg values: T): ArrayList { +public fun arrayList(vararg values: T): ArrayList { val c = ArrayList() for (v in values) { c.add(v) @@ -19,7 +19,7 @@ public inline fun arrayList(vararg values: T): ArrayList { return c } -public inline val ArrayList.head: T +public val ArrayList.head: T get() { return get(0) - } \ No newline at end of file + } diff --git a/js/js.translator/testData/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt b/js/js.translator/testData/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt index 37f77669c71..df3889d8da5 100644 --- a/js/js.translator/testData/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt +++ b/js/js.translator/testData/extensionFunction/cases/extensionOnClassWithExplicitAndImplicitReceiver.kt @@ -8,11 +8,11 @@ public class Foo { } -public inline fun Foo.fooImp(): String { +public fun Foo.fooImp(): String { return "impl" + blah() } -public inline fun Foo.fooExp(): String { +public fun Foo.fooExp(): String { return "expl" + this.blah() } @@ -21,4 +21,4 @@ fun box(): Boolean { if (a.fooImp() != "impl5") return false if (a.fooExp() != "expl5") return false return true; -} \ No newline at end of file +} diff --git a/js/js.translator/testData/multideclaration/cases/multiValForMap.kt b/js/js.translator/testData/multideclaration/cases/multiValForMap.kt index bf517a4b16a..e18e5d3f774 100644 --- a/js/js.translator/testData/multideclaration/cases/multiValForMap.kt +++ b/js/js.translator/testData/multideclaration/cases/multiValForMap.kt @@ -3,7 +3,7 @@ package foo import java.util.HashMap -public inline fun Map.iterator(): Iterator> { +public fun Map.iterator(): Iterator> { val entrySet = this.entrySet() return entrySet.iterator() } @@ -38,4 +38,4 @@ fun box(): String { if (s2 != "s2") return "s2 != 's2', it: ${s2}" return "OK" -} \ No newline at end of file +} diff --git a/js/js.translator/testData/stdlib/cases/Filter.kt b/js/js.translator/testData/stdlib/cases/Filter.kt index 7f1c5fdb167..eef573dcf36 100644 --- a/js/js.translator/testData/stdlib/cases/Filter.kt +++ b/js/js.translator/testData/stdlib/cases/Filter.kt @@ -6,12 +6,12 @@ import java.lang.Iterable /* Filters given iterator */ -inline fun java.util.Iterator.filter(f: (T) -> Boolean): java.util.Iterator = FilterIterator(this, f) +fun java.util.Iterator.filter(f: (T) -> Boolean): java.util.Iterator = FilterIterator(this, f) /* Adds filtered elements in to given container */ -inline fun > java.lang.Iterable.filterTo(var container: U, filter: (T) -> Boolean): U { +fun > java.lang.Iterable.filterTo(var container: U, filter: (T) -> Boolean): U { for (element in this) { if (filter(element)) container.add(element) @@ -23,7 +23,7 @@ inline fun > java.lang.Iterable.filterTo(var containe Create iterator filtering given java.lang.Iterable */ /* -inline fun java.lang.Iterable.filter(f: (T)->Boolean) : java.util.Iterator = (iterator() as java.util.Iterator).filter(f) +fun java.lang.Iterable.filter(f: (T)->Boolean) : java.util.Iterator = (iterator() as java.util.Iterator).filter(f) */ private class FilterIterator(val original: java.util.Iterator, val filter: (T) -> Boolean) : java.util.Iterator {