docs/List.md

@@ -175,8 +175,6 @@ List could be sorted in place, just like [Collection] provide sorted copies, in
 | `[Range]`                     | get slice of the array (copy)                | Range       |
 | `+=`                          | append element(s) (2)                        | List or Obj |
 | `List.fill(size, block)`      | build a new list from indices `0..<size`     | Int, Callable |
-| `List.fill(size,capacity,block)` | same, pre-allocating capacity slots       | Int, Int, Callable |
-| `ensureCapacity(count)`       | pre-allocate storage for at least `count` elements without reallocation (5) | Int |
 | `sort()`                      | in-place sort, natural order                 | void        |
 | `sortBy(predicate)`           | in-place sort bu `predicate` call result (3) | void        |
 | `sortWith(comparator)`        | in-place sort using `comarator` function (4) | void        |
@@ -199,11 +197,6 @@ order, e.g. is same as `list.sortWith { a,b -> predicate(a) <=> predicate(b) }`
 positive if first is greater, and zero if they are equal. For example, the equvalent comparator
 for `sort()` will be `sort { a, b -> a <=> b }
 
-(5)
-: if the current capacity is already ≥ `count`, this is a no-op. Otherwise the internal storage
-is reallocated to hold at least `count` elements. Use this before a bulk `+=` loop to avoid
-repeated reallocations. `List.fill(size, capacity, block)` calls this automatically.
-
 It inherits from [Iterable] too and thus all iterable methods are applicable to any list.
 
 ## Observable list hooks

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt

@@ -2096,19 +2096,12 @@ class Compiler(
         plan.captureOwners[name] = slotLoc
         plan.captures += capture
         if (!plan.slotPlan.slots.containsKey(name)) {
-            val newSlot = plan.slotPlan.nextIndex
             plan.slotPlan.slots[name] = SlotEntry(
-                newSlot,
+                plan.slotPlan.nextIndex,
                 isMutable = slotLoc.isMutable,
                 isDelegated = slotLoc.isDelegated
             )
             plan.slotPlan.nextIndex += 1
-            slotTypeByScopeId[slotLoc.scopeId]?.get(slotLoc.slot)?.let { cls ->
-                slotTypeByScopeId.getOrPut(plan.slotPlan.id) { mutableMapOf() }[newSlot] = cls
-            }
-            slotTypeDeclByScopeId[slotLoc.scopeId]?.get(slotLoc.slot)?.let { decl ->
-                slotTypeDeclByScopeId.getOrPut(plan.slotPlan.id) { mutableMapOf() }[newSlot] = decl
-            }
         }
     }
 
@@ -3424,10 +3417,6 @@ class Compiler(
                     index < expectedParams.size
                 ) {
                     expectedParams[index]
-                } else if (param.type == TypeDecl.TypeAny && index == 0 && argsDeclaration.params.size == 1 &&
-                    implicitItType != null
-                ) {
-                    implicitItType
                 } else {
                     param.type
                 }
@@ -10357,9 +10346,6 @@ class Compiler(
             if (initClass != null) {
                 classFieldTypesByName.getOrPut(declaringClassNameCaptured) { mutableMapOf() }[name] = initClass
             }
-            if (!isDelegate && varTypeDecl is TypeDecl.Generic) {
-                classMemberTypeDeclByName.getOrPut(declaringClassNameCaptured) { mutableMapOf() }[name] = varTypeDecl
-            }
         }
 
         // Emit MiniValDecl for this declaration (before execution wiring), attach doc if any

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjList.kt

@@ -528,22 +528,6 @@ open class ObjList(initialList: MutableList<Obj> = mutableListOf()) : Obj() {
                 } else self.list.removeLast()
                 self
             }
-            addFnDoc(
-                name= "ensureCapacity",
-                doc = """
-                    ensure the list capacity allows storing specified amount if items without reallocation. 
-                    If current capacity is greater or equal to `count`, does nothing. Note that possible reallocation
-                    could be a costly operation,
-                """.trimIndent(),
-                params = listOf(ParamDoc("count", type("lyng.Int"))),
-                moduleName = "lyng.stdlib"
-            ) {
-                val self = thisAs<ObjList>()
-                val list = self.list as ArrayList
-                val count = requireOnlyArg<ObjInt>().value.toInt()
-                list.ensureCapacity(count)
-                self
-            }
 
             addFnDoc(
                 name = "removeRange",

lynglib/src/commonTest/kotlin/StdlibTest.kt

@@ -436,12 +436,4 @@ class StdlibTest {
             assertEquals(2, x)
         """.trimIndent())
     }
-
-    @Test
-    fun testListFill() = runTest {
-        eval("""
-            val x = List.fill(5) { i -> i * 10 }
-            assertEquals([0, 10, 20, 30, 40], x)
-        """.trimIndent())
-    }
 }

lynglib/stdlib/lyng/root.lyng

@@ -432,19 +432,11 @@ fun List<T>.sort(): void {
     sortWith { a, b -> a <=> b }
 }
 
-/*
+/* Build a new list of `size` elements by calling `block(index)` for each index. */
-    Build a new list of `size` elements by calling `block(index)` for each index.
+static fun List<T>.fill(size: Int, block: (Int)->T): List<T> {
-    `capacity` less size is ignored (size will be used as capacity).
+    val result = List<T>()
-*/
+    for( i in 0..<size ) result += block(i)
-static fun List<T>.fill(size: Int, capacity = -1, block: (Int)->T): List<T> {
+    result
-    require(size >= 0, "size must not be negative")
-    val capacity = capacity < size ? size : capacity
-    List<T>().also {
-        if( size > 0 ) {
-            it.ensureCapacity(capacity)
-            for( i in 0..<size ) it += block(i)
-        }
-    }
 }
 
 /* Print this exception and its stack trace to standard output. */
@@ -553,7 +545,8 @@ class StackTraceEntry(
 }
 // Private helper: starts one LaunchPool worker coroutine for the given queue.
 // Defined outside LaunchPool so the global `launch` is not shadowed by the method.
-private fun _launchPoolWorker(ch: Channel): Deferred {
+private fun _launchPoolWorker(q) {
+    val ch = q as Channel
     launch {
         var task = ch.receive()
         while (task != null) {
@@ -595,7 +588,7 @@ class LaunchPool(maxWorkers, maxQueueSize = Channel.UNLIMITED) {
         mu.withLock {
             if (isClosed) throw IllegalStateException("LaunchPool is closed")
         }
-            val d = CompletableDeferred()
+        val d = CompletableDeferred()
         val wrapper = {
             try { d.complete(lambda()) }
             catch(e) { d.completeExceptionally(e) }
@@ -625,7 +618,7 @@ class LaunchPool(maxWorkers, maxQueueSize = Channel.UNLIMITED) {
     */
     fun cancel() {
         closeQueue()
-        workers.forEach { it.cancel() }
+        workers.forEach { (it as Deferred).cancel() }
     }
 
     /*
@@ -635,7 +628,7 @@ class LaunchPool(maxWorkers, maxQueueSize = Channel.UNLIMITED) {
     */
     fun cancelAndJoin() {
         closeQueue()
-        workers.forEach { it.cancel() }
+        workers.forEach { (it as Deferred).cancel() }
     }
 
     /*
@@ -646,7 +639,7 @@ class LaunchPool(maxWorkers, maxQueueSize = Channel.UNLIMITED) {
     fun closeAndJoin() {
         closeQueue()
         for (w in workers) {
-            w.await()
+            (w as Deferred).await()
         }
     }
 }