SergeychWorks/lyng
1
0
Fork 0
Code Issues 7 Pull Requests Actions Packages Projects 1 Releases 5 Wiki Activity

further Arguments optimizations

Browse Source
This commit is contained in:
Sergey Chernov 2025-06-11 09:12:07 +04:00
parent c0eba1ecf0
commit 382532e0e1
3 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
library/src/commonMain/kotlin/net/sergeych/lyng/ArgsDeclaration.kt
View File

@ -74,7 +74,7 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
fun processEllipsis(index: Int, toFromIndex: Int) { fun processEllipsis(index: Int, toFromIndex: Int) {
val a = params[index] val a = params[index]
val l = if (index > toFromIndex) ObjList() val l = if (index > toFromIndex) ObjList()
else ObjList(fromArgs.values.subList(index, toFromIndex + 1).toMutableList()) else ObjList(fromArgs.list.subList(index, toFromIndex + 1).toMutableList())
assign(a, l) assign(a, l)
} }

8
library/src/commonMain/kotlin/net/sergeych/lyng/Arguments.kt
View File

@ -28,12 +28,8 @@ suspend fun Collection<ParsedArgument>.toArguments(context: Context): Arguments
data class Arguments(val list: List<Obj>) : List<Obj> by list { data class Arguments(val list: List<Obj>) : List<Obj> by list {
data class Info(val value: Obj, val pos: Pos) fun firstAndOnly(pos: Pos = Pos.UNKNOWN): Obj {
if (list.size != 1) throw ScriptError(pos, "expected one argument, got ${list.size}")
val values = list
fun firstAndOnly(): Obj {
if (list.size != 1) throw IllegalArgumentException("Expected one argument, got ${list.size}")
return list.first() return list.first()
} }

2
library/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt
View File

@ -379,7 +379,7 @@ class Compiler(
val context = closure!!.copy(pos, args) val context = closure!!.copy(pos, args)
if (argsDeclaration == null) { if (argsDeclaration == null) {
// no args: automatic var 'it' // no args: automatic var 'it'
val l = args.values val l = args.list
val itValue: Obj = when (l.size) { val itValue: Obj = when (l.size) {
// no args: it == void // no args: it == void
0 -> ObjVoid 0 -> ObjVoid