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

@@ -428,14 +428,14 @@ open class ObjClass(
                 if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
                 if (rec.visibility == Visibility.Private) continue
                 val id = rec.fieldId ?: cls.assignFieldId(name, rec)
-                if (!result.containsKey(name)) result[name] = id
+                result.putIfAbsent(name, id)
             }
             cls.classScope?.objects?.forEach { (name, rec) ->
                 if (rec.isAbstract) return@forEach
                 if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) return@forEach
                 if (rec.visibility == Visibility.Private) return@forEach
                 val id = rec.fieldId ?: cls.assignFieldId(name, rec)
-                if (!result.containsKey(name)) result[name] = id
+                result.putIfAbsent(name, id)
             }
         }
         return result
@@ -451,7 +451,7 @@ open class ObjClass(
                     rec.type != ObjRecord.Type.Property &&
                     rec.type != ObjRecord.Type.Delegated) continue
                 val id = rec.methodId ?: cls.assignMethodId(name, rec)
-                if (!result.containsKey(name)) result[name] = id
+                result.putIfAbsent(name, id)
             }
             cls.classScope?.objects?.forEach { (name, rec) ->
                 if (!includeAbstract && rec.isAbstract) return@forEach
@@ -460,7 +460,7 @@ open class ObjClass(
                     rec.type != ObjRecord.Type.Property &&
                     rec.type != ObjRecord.Type.Delegated) return@forEach
                 val id = rec.methodId ?: cls.assignMethodId(name, rec)
-                if (!result.containsKey(name)) result[name] = id
+                result.putIfAbsent(name, id)
             }
         }
         return result
@@ -497,7 +497,7 @@ open class ObjClass(
                     rec.type != ObjRecord.Type.Delegated
                 ) continue
                 val id = rec.methodId ?: cls.assignMethodId(name, rec)
-                if (!methodIdMap.containsKey(name)) methodIdMap[name] = id
+                methodIdMap.putIfAbsent(name, id)
                 if (id > maxId) maxId = id
             }
             cls.classScope?.objects?.forEach { (name, rec) ->
@@ -506,7 +506,7 @@ open class ObjClass(
                     rec.type != ObjRecord.Type.Delegated
                 ) return@forEach
                 val id = rec.methodId ?: cls.assignMethodId(name, rec)
-                if (!methodIdMap.containsKey(name)) methodIdMap[name] = id
+                methodIdMap.putIfAbsent(name, id)
                 if (id > maxId) maxId = id
             }
         }

lynglib/src/commonTest/kotlin/net/sergeych/lyng/highlight/MapLiteralHighlightTest.kt

@@ -21,7 +21,7 @@ import kotlin.test.Ignore
 import kotlin.test.Test
 import kotlin.test.assertTrue
 
-@Ignore
+@Ignore("Highlight tests postponed until ScriptTest baseline is restored")
 class MapLiteralHighlightTest {
 
     private fun spansToLabeled(text: String, spans: List<HighlightSpan>): List<Pair<String, HighlightKind>> =

lynglib/stdlib/lyng/root.lyng

@@ -8,20 +8,6 @@ extern class IllegalArgumentException
 extern class NotImplementedException
 extern class Delegate
 
-extern class Iterable<T> {
-    fun iterator(): Iterator<T>
-    fun forEach(action: (T)->Void): Void
-    fun map<R>(transform: (T)->R): List<R>
-    fun toList(): List<T>
-}
-
-extern class Iterator<T> {
-    fun hasNext(): Bool
-    fun next(): T
-    fun cancelIteration(): Void
-    fun toList(): List<T>
-}
-
 // Built-in math helpers (implemented in host runtime).
 extern fun abs(x: Object): Real
 extern fun ln(x: Object): Real
@@ -29,15 +15,15 @@ extern fun pow(x: Object, y: Object): Real
 extern fun sqrt(x: Object): Real
 
 // Last regex match result, updated by =~ / !~.
-var $~: Object? = null
+var $~ = null
 
 /*
     Wrap a builder into a zero-argument thunk that computes once and caches the result.
     The first call invokes builder() and stores the value; subsequent calls return the cached value.
 */
 fun cached<T>(builder: ()->T): ()->T {
-    var calculated: Bool = false
+    var calculated = false
-    var value: Object? = null
+    var value = null
     {
         if( !calculated ) {
             value = builder()
@@ -49,7 +35,7 @@ fun cached<T>(builder: ()->T): ()->T {
 /* Filter elements of this iterable using the provided predicate and provide a flow
     of results. Coudl be used to map infinte flows, etc.
 */
-fun Iterable<T>.filterFlow(predicate: (T)->Bool): Flow<T> {
+fun Iterable.filterFlow<T>(predicate: (T)->Bool): Flow<T> {
     val list = this
     flow {
         for( item in list ) {
@@ -63,7 +49,7 @@ fun Iterable<T>.filterFlow(predicate: (T)->Bool): Flow<T> {
 /*
     Filter this iterable and return List of elements
 */
-fun Iterable<T>.filter(predicate: (T)->Bool): List<T> {
+fun Iterable.filter<T>(predicate: (T)->Bool): List<T> {
     var result: List<T> = List()
     for( item in this ) if( predicate(item) ) result += item
     result
@@ -72,7 +58,7 @@ fun Iterable<T>.filter(predicate: (T)->Bool): List<T> {
 /*
     Count all items in this iterable for which predicate returns true
 */
-fun Iterable<T>.count(predicate: (T)->Bool): Int {
+fun Iterable.count<T>(predicate: (T)->Bool): Int {
     var hits = 0
     this.forEach {
         if( predicate(it) ) hits++
@@ -83,25 +69,25 @@ fun Iterable<T>.count(predicate: (T)->Bool): Int {
     filter out all null elements from this collection (Iterable); flow of
     non-null elements is returned
 */
-fun Iterable<T>.filterFlowNotNull(): Flow<T> {
+fun Iterable.filterFlowNotNull<T>(): Flow<T> {
     filterFlow { it != null }
 }
 
 /* Filter non-null elements and collect them into a List
 */
-fun Iterable<T>.filterNotNull(): List<T> {
+fun Iterable.filterNotNull<T>(): List<T> {
     filter { it != null }
 }
 
 /* Skip the first N elements of this iterable. */
-fun Iterable<T>.drop(n: Int): List<T> {
+fun Iterable.drop<T>(n: Int): List<T> {
     var cnt = 0
     filter { cnt++ >= n }
 }
 
 /* Return the first element or throw if the iterable is empty. */
-val Iterable<T>.first: T get() {
+val Iterable.first: Object get() {
-    val i: Iterator<T> = iterator()
+    val i: Iterator = iterator()
     if( !i.hasNext() ) throw NoSuchElementException()
         i.next().also { i.cancelIteration() }
 }
@@ -110,7 +96,7 @@ val Iterable<T>.first: T get() {
     Return the first element that matches the predicate or throws
     NuSuchElementException
 */
-fun Iterable<T>.findFirst(predicate: (T)->Bool): T {
+fun Iterable.findFirst<T>(predicate: (T)->Bool): T {
     for( x in this ) {
         if( predicate(x) )
             break x
@@ -121,7 +107,7 @@ fun Iterable<T>.findFirst(predicate: (T)->Bool): T {
 /*
     return the first element matching the predicate or null
 */
-fun Iterable<T>.findFirstOrNull(predicate: (T)->Bool): T? {
+fun Iterable.findFirstOrNull<T>(predicate: (T)->Bool): T? {
     for( x in this ) {
         if( predicate(x) )
             break x
@@ -131,19 +117,19 @@ fun Iterable<T>.findFirstOrNull(predicate: (T)->Bool): T? {
 
 
 /* Return the last element or throw if the iterable is empty. */
-val Iterable<T>.last: T get() {
+val Iterable.last: Object get() {
     var found = false
-    var element: Object = Unset
+    var element = null
     for( i in this ) {
         element = i
         found = true
     }
     if( !found ) throw NoSuchElementException()
-        element as T
+        element
 }
 
 /* Emit all but the last N elements of this iterable. */
-fun Iterable<T>.dropLast(n: Int): Flow<T> {
+fun Iterable.dropLast<T>(n: Int): Flow<T> {
     val list = this
     val buffer = RingBuffer(n)
     flow {
@@ -156,25 +142,25 @@ fun Iterable<T>.dropLast(n: Int): Flow<T> {
 }
 
 /* Return the last N elements of this iterable as a buffer/list. */
-fun Iterable<T>.takeLast(n: Int): RingBuffer<T> {
+fun Iterable.takeLast<T>(n: Int): RingBuffer<T> {
     val buffer: RingBuffer<T> = RingBuffer(n)
     for( item in this ) buffer += item
     buffer
 }
 
 /* Join elements into a string with a separator (separator parameter) and optional transformer. */
-fun Iterable<T>.joinToString(separator: String=" ", transformer: (T)->Object = { it }): String {
+fun Iterable.joinToString<T>(separator: String=" ", transformer: (T)->Object = { it }): String {
-    var result: String? = null
+    var result = null
     for( part in this ) {
         val transformed = transformer(part).toString()
         if( result == null ) result = transformed
-        else result = (result as String) + separator + transformed
+        else result += separator + transformed
     }
     result ?: ""
 }
 
 /* Return true if any element matches the predicate. */
-fun Iterable<T>.any(predicate: (T)->Bool): Bool {
+fun Iterable.any<T>(predicate: (T)->Bool): Bool {
     for( i in this ) {
         if( predicate(i) )
             break true
@@ -182,13 +168,13 @@ fun Iterable<T>.any(predicate: (T)->Bool): Bool {
 }
 
 /* Return true if all elements match the predicate. */
-fun Iterable<T>.all(predicate: (T)->Bool): Bool {
+fun Iterable.all<T>(predicate: (T)->Bool): Bool {
     !any { !predicate(it) }
 }
 
 /* Sum all elements; returns null for empty collections. */
-fun Iterable<T>.sum(): T? {
+fun Iterable.sum<T>(): T? {
-    val i: Iterator<T> = iterator()
+    val i: Iterator = iterator()
     if( i.hasNext() ) {
         var result = i.next()
         while( i.hasNext() ) result += i.next()
@@ -198,8 +184,8 @@ fun Iterable<T>.sum(): T? {
 }
 
 /* Sum mapped values of elements; returns null for empty collections. */
-fun Iterable<T>.sumOf<R>(f: (T)->R): R? {
+fun Iterable.sumOf<T,R>(f: (T)->R): R? {
-    val i: Iterator<T> = iterator()
+    val i: Iterator = iterator()
     if( i.hasNext() ) {
         var result = f(i.next())
         while( i.hasNext() ) result += f(i.next())
@@ -209,8 +195,8 @@ fun Iterable<T>.sumOf<R>(f: (T)->R): R? {
 }
 
 /* Minimum value of the given function applied to elements of the collection. */
-fun Iterable<T>.minOf<R>(lambda: (T)->R): R {
+fun Iterable.minOf<T,R>(lambda: (T)->R): R {
-    val i: Iterator<T> = iterator()
+    val i: Iterator = iterator()
     var minimum = lambda( i.next() )
     while( i.hasNext() ) {
         val x = lambda(i.next())
@@ -220,8 +206,8 @@ fun Iterable<T>.minOf<R>(lambda: (T)->R): R {
 }
 
 /* Maximum value of the given function applied to elements of the collection. */
-fun Iterable<T>.maxOf<R>(lambda: (T)->R): R {
+fun Iterable.maxOf<T,R>(lambda: (T)->R): R {
-    val i: Iterator<T> = iterator()
+    val i: Iterator = iterator()
     var maximum = lambda( i.next() )
     while( i.hasNext() ) {
         val x = lambda(i.next())
@@ -231,17 +217,17 @@ fun Iterable<T>.maxOf<R>(lambda: (T)->R): R {
 }
 
 /* Return elements sorted by natural order. */
-fun Iterable<T>.sorted(): List<T> {
+fun Iterable.sorted<T>(): List<T> {
     sortedWith { a, b -> a <=> b }
 }
 
 /* Return elements sorted by the key selector. */
-fun Iterable<T>.sortedBy<R>(predicate: (T)->R): List<T> {
+fun Iterable.sortedBy<T,R>(predicate: (T)->R): List<T> {
     sortedWith { a, b -> predicate(a) <=> predicate(b) }
 }
 
 /* Return a shuffled copy of the iterable as a list. */
-fun Iterable<T>.shuffled(): List<T> {
+fun Iterable.shuffled<T>(): List<T> {
     val list: List<T> = toList()
     list.shuffle()
     list
@@ -251,7 +237,7 @@ fun Iterable<T>.shuffled(): List<T> {
     Returns a single list of all elements from all collections in the given collection.
     @return List
 */
-fun Iterable<Iterable<T>>.flatten(): List<T> {
+fun Iterable.flatten<T>(): List<T> {
     var result: List<T> = List()
     forEach { i ->
         i.forEach { result += it }
@@ -263,13 +249,13 @@ fun Iterable<Iterable<T>>.flatten(): List<T> {
     Returns a single list of all elements yielded from results of transform function being
     invoked on each element of original collection.
 */
-fun Iterable<T>.flatMap<R>(transform: (T)->Iterable<R>): List<R> {
+fun Iterable.flatMap<T,R>(transform: (T)->Iterable<R>): List<R> {
     val mapped: List<Iterable<R>> = map(transform)
     mapped.flatten()
 }
 
 /* Return string representation like [a,b,c]. */
-override fun List<T>.toString() {
+override fun List.toString() {
     var first = true
     var result = "["
     for (item in this) {
@@ -281,12 +267,12 @@ override fun List<T>.toString() {
 }
 
 /* Sort list in-place by key selector. */
-fun List<T>.sortBy<R>(predicate: (T)->R): Void {
+fun List.sortBy<T,R>(predicate: (T)->R): Void {
     sortWith { a, b -> predicate(a) <=> predicate(b) }
 }
 
 /* Sort list in-place by natural order. */
-fun List<T>.sort(): Void {
+fun List.sort<T>(): Void {
     sortWith { a, b -> a <=> b }
 }
 
@@ -341,7 +327,9 @@ interface Delegate<T,ThisRefType=Void> {
     returns what the block returns.
 */
 fun with<T,R>(self: T, block: T.()->R): R {
-    block(self)
+    var result = Unset
+    self.apply { result = block() }
+    result as R
 }
 
 /*
@@ -349,16 +337,16 @@ fun with<T,R>(self: T, block: T.()->R): R {
     The provided creator lambda is called once on the first access to compute the value.
     Can only be used with 'val' properties.
 */
-class lazy<T,ThisRefType=Object>(creatorParam: ThisRefType.()->T) : Delegate<T,ThisRefType> {
+class lazy<T>(creatorParam: Object.()->T) : Delegate<T,Object> {
-    private val creator: ThisRefType.()->T = creatorParam
+    private val creator: Object.()->T = creatorParam
     private var value = Unset
 
-    override fun bind(name: String, access: DelegateAccess, thisRef: ThisRefType): Object {
+    override fun bind(name: String, access: DelegateAccess, thisRef: Object): Object {
         if (access.toString() != "DelegateAccess.Val") throw "lazy delegate can only be used with 'val'"
         this
     }
 
-    override fun getValue(thisRef: ThisRefType, name: String): T {
+    override fun getValue(thisRef: Object, name: String): T {
         if (value == Unset)
             value = with(thisRef,creator)
         value as T