Compare commits
38
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
d92309d76c | ||
|
|
767e995a96 | ||
|
|
794553d81d | ||
|
|
d9d7cafec8 | ||
|
|
1a080bc53e | ||
|
|
a6492bb750 | ||
|
|
d2a47d34a3 | ||
|
|
8e0442670d | ||
|
|
74eb8ff082 | ||
|
|
2b13fe8053 | ||
|
|
979e6ea9b7 | ||
|
|
e447c778ed | ||
|
|
37d093817e | ||
|
|
c54d947f1c | ||
|
|
8a32ffe655 | ||
|
|
65edf9fe67 | ||
|
|
18394ce286 | ||
|
|
298c2a09fe | ||
|
|
a9da21e7a4 | ||
|
|
4581998ba3 | ||
|
|
62dc501657 | ||
|
|
8b5e6ee993 | ||
|
|
9417f8f0cc | ||
|
|
c9021eb9cf | ||
|
|
3bfb80a7c1 | ||
|
|
32a7adf56e | ||
|
|
90e586b5d2 | ||
|
|
f03006ce37 | ||
|
|
1502a365bf | ||
|
|
d6a535590e | ||
|
|
c351e6ff1e | ||
|
|
8e10540257 | ||
|
|
9f10786a94 | ||
|
|
274abaaf03 | ||
|
|
51b0d1fdfc | ||
|
|
c46f74bd7e | ||
|
|
87ef1c38b8 | ||
|
|
529f76489b |
No files matched your search
@@ -1,5 +1,11 @@
|
|||||||
# AI Agent Notes
|
# AI Agent Notes
|
||||||
|
|
||||||
|
## Canonical AI References
|
||||||
|
- Use `docs/ai_language_reference.md` as the primary, compiler-verified Lyng language reference for code generation.
|
||||||
|
- For generics-heavy code generation, follow `docs/ai_language_reference.md` section `7.1 Generics Runtime Model and Bounds` and `7.2 Differences vs Java / Kotlin / Scala`.
|
||||||
|
- Use `docs/ai_stdlib_reference.md` for default runtime/module APIs and stdlib surface.
|
||||||
|
- Treat `LYNG_AI_SPEC.md` and older docs as secondary if they conflict with the two files above.
|
||||||
|
|
||||||
## Kotlin/Wasm generation guardrails
|
## Kotlin/Wasm generation guardrails
|
||||||
- Avoid creating suspend lambdas for compiler runtime statements. Prefer explicit `object : Statement()` with `override suspend fun execute(...)`.
|
- Avoid creating suspend lambdas for compiler runtime statements. Prefer explicit `object : Statement()` with `override suspend fun execute(...)`.
|
||||||
- Do not use `statement { ... }` or other inline suspend lambdas in compiler hot paths (e.g., parsing/var declarations, initializer thunks).
|
- Do not use `statement { ... }` or other inline suspend lambdas in compiler hot paths (e.g., parsing/var declarations, initializer thunks).
|
||||||
@@ -21,3 +27,7 @@
|
|||||||
- Create closure references only when a capture is detected; use a direct frame+slot reference (foreign slot ref) instead of scope slots.
|
- Create closure references only when a capture is detected; use a direct frame+slot reference (foreign slot ref) instead of scope slots.
|
||||||
- Keep Scope as a lazy reflection facade: resolve name -> slot only on demand for Kotlin interop (no eager name mapping on every call).
|
- Keep Scope as a lazy reflection facade: resolve name -> slot only on demand for Kotlin interop (no eager name mapping on every call).
|
||||||
- Avoid PUSH_SCOPE/POP_SCOPE in bytecode for loops/functions unless dynamic name access or Kotlin reflection is requested.
|
- Avoid PUSH_SCOPE/POP_SCOPE in bytecode for loops/functions unless dynamic name access or Kotlin reflection is requested.
|
||||||
|
|
||||||
|
## ABI proposal notes
|
||||||
|
- Runtime generic metadata for generic extern classes is tracked in `proposals/extern_generic_runtime_abi.md`.
|
||||||
|
- Keep this design `Obj`-centric: do not assume extern-class values are `ObjInstance`; collection must be enabled on `ObjClass`.
|
||||||
+5
-6
@@ -20,13 +20,12 @@
|
|||||||
set -e
|
set -e
|
||||||
echo "publishing all artifacts"
|
echo "publishing all artifacts"
|
||||||
echo
|
echo
|
||||||
./gradlew publishToMavenLocal
|
./gradlew publishToMavenLocal site:jsBrowserDistribution publish buildInstallablePlugin :lyng:linkReleaseExecutableLinuxX64 :lyng:installJvmDist --parallel
|
||||||
./gradlew publish
|
|
||||||
|
|
||||||
echo
|
#echo
|
||||||
echo "Creating plugin"
|
#echo "Creating plugin"
|
||||||
echo
|
#echo
|
||||||
./gradlew buildInstallablePlugin
|
#./gradlew buildInstallablePlugin
|
||||||
|
|
||||||
echo
|
echo
|
||||||
echo "building CLI tools"
|
echo "building CLI tools"
|
||||||
|
|||||||
@@ -35,3 +35,27 @@ tasks.register<Exec>("generateDocs") {
|
|||||||
description = "Generates a single-file documentation HTML using bin/generate_docs.sh"
|
description = "Generates a single-file documentation HTML using bin/generate_docs.sh"
|
||||||
commandLine("./bin/generate_docs.sh")
|
commandLine("./bin/generate_docs.sh")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Sample generator task for .lyng.d definition files (not wired into build).
|
||||||
|
// Usage: ./gradlew generateLyngDefsSample
|
||||||
|
tasks.register("generateLyngDefsSample") {
|
||||||
|
group = "lyng"
|
||||||
|
description = "Generate a sample .lyng.d file under build/generated/lyng/defs"
|
||||||
|
outputs.dir(layout.buildDirectory.dir("generated/lyng/defs"))
|
||||||
|
doLast {
|
||||||
|
val outDir = layout.buildDirectory.dir("generated/lyng/defs").get().asFile
|
||||||
|
outDir.mkdirs()
|
||||||
|
val outFile = outDir.resolve("sample.lyng.d")
|
||||||
|
outFile.writeText(
|
||||||
|
"""
|
||||||
|
/** Generated API */
|
||||||
|
extern fun ping(): Int
|
||||||
|
|
||||||
|
/** Generated class */
|
||||||
|
class Generated(val name: String) {
|
||||||
|
fun greet(): String = "hi " + name
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-2
@@ -1,8 +1,8 @@
|
|||||||
# Array
|
# Array
|
||||||
|
|
||||||
It's an interface if the [Collection] that provides indexing access, like `array[3] = 0`.
|
It's an interface if the [Collection] that provides indexing access, like `array[3] = 0`.
|
||||||
Array therefore implements [Iterable] too. The well known implementatino of the `Array` is
|
Array therefore implements [Iterable] too. Well known implementations of `Array` are
|
||||||
[List].
|
[List] and [ImmutableList].
|
||||||
|
|
||||||
Array adds the following methods:
|
Array adds the following methods:
|
||||||
|
|
||||||
@@ -35,3 +35,4 @@ To pre-sort and array use `Iterable.sorted*` or in-place `List.sort*` families,
|
|||||||
[Collection]: Collection.md
|
[Collection]: Collection.md
|
||||||
[Iterable]: Iterable.md
|
[Iterable]: Iterable.md
|
||||||
[List]: List.md
|
[List]: List.md
|
||||||
|
[ImmutableList]: ImmutableList.md
|
||||||
@@ -6,6 +6,13 @@ Is a [Iterable] with known `size`, a finite [Iterable]:
|
|||||||
val size
|
val size
|
||||||
}
|
}
|
||||||
|
|
||||||
|
`Collection` is a read/traversal contract shared by mutable and immutable collections.
|
||||||
|
Concrete collection classes:
|
||||||
|
|
||||||
|
- Mutable: [List], [Set], [Map]
|
||||||
|
- Immutable: [ImmutableList], [ImmutableSet], [ImmutableMap]
|
||||||
|
- Observable mutable lists (opt-in module): [ObservableList]
|
||||||
|
|
||||||
| name | description |
|
| name | description |
|
||||||
|------------------------|------------------------------------------------------|
|
|------------------------|------------------------------------------------------|
|
||||||
|
|
||||||
@@ -17,3 +24,8 @@ See [List], [Set], [Iterable] and [Efficient Iterables in Kotlin Interop](Effici
|
|||||||
[Iterable]: Iterable.md
|
[Iterable]: Iterable.md
|
||||||
[List]: List.md
|
[List]: List.md
|
||||||
[Set]: Set.md
|
[Set]: Set.md
|
||||||
|
[Map]: Map.md
|
||||||
|
[ImmutableList]: ImmutableList.md
|
||||||
|
[ImmutableSet]: ImmutableSet.md
|
||||||
|
[ImmutableMap]: ImmutableMap.md
|
||||||
|
[ObservableList]: ObservableList.md
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# ImmutableList built-in class
|
||||||
|
|
||||||
|
`ImmutableList` is an immutable, indexable list value.
|
||||||
|
It implements [Array], therefore [Collection] and [Iterable].
|
||||||
|
|
||||||
|
Use it when API contracts require a list that cannot be mutated through aliases.
|
||||||
|
|
||||||
|
## Creating
|
||||||
|
|
||||||
|
val a = ImmutableList(1,2,3)
|
||||||
|
val b = [1,2,3].toImmutable()
|
||||||
|
val c = (1..3).toImmutableList()
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Converting
|
||||||
|
|
||||||
|
val i = ImmutableList(1,2,3)
|
||||||
|
val m = i.toMutable()
|
||||||
|
m += 4
|
||||||
|
assertEquals( ImmutableList(1,2,3), i )
|
||||||
|
assertEquals( [1,2,3,4], m )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Members
|
||||||
|
|
||||||
|
| name | meaning |
|
||||||
|
|---------------|-----------------------------------------|
|
||||||
|
| `size` | number of elements |
|
||||||
|
| `[index]` | element access by index |
|
||||||
|
| `[Range]` | immutable slice |
|
||||||
|
| `+` | append element(s), returns new immutable list |
|
||||||
|
| `-` | remove element(s), returns new immutable list |
|
||||||
|
| `toMutable()` | create mutable copy |
|
||||||
|
|
||||||
|
[Array]: Array.md
|
||||||
|
[Collection]: Collection.md
|
||||||
|
[Iterable]: Iterable.md
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
# ImmutableMap built-in class
|
||||||
|
|
||||||
|
`ImmutableMap` is an immutable map of key-value pairs.
|
||||||
|
It implements [Collection] and [Iterable] of [MapEntry].
|
||||||
|
|
||||||
|
## Creating
|
||||||
|
|
||||||
|
val a = ImmutableMap("a" => 1, "b" => 2)
|
||||||
|
val b = Map("a" => 1, "b" => 2).toImmutable()
|
||||||
|
val c = ["a" => 1, "b" => 2].toImmutableMap
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Converting
|
||||||
|
|
||||||
|
val i = ImmutableMap("a" => 1)
|
||||||
|
val m = i.toMutable()
|
||||||
|
m["a"] = 2
|
||||||
|
assertEquals( 1, i["a"] )
|
||||||
|
assertEquals( 2, m["a"] )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Members
|
||||||
|
|
||||||
|
| name | meaning |
|
||||||
|
|-----------------|------------------------------------------|
|
||||||
|
| `size` | number of entries |
|
||||||
|
| `[key]` | get value by key, or `null` if absent |
|
||||||
|
| `getOrNull(key)`| same as `[key]` |
|
||||||
|
| `keys` | list of keys |
|
||||||
|
| `values` | list of values |
|
||||||
|
| `+` | merge (rightmost wins), returns new immutable map |
|
||||||
|
| `toMutable()` | create mutable copy |
|
||||||
|
|
||||||
|
[Collection]: Collection.md
|
||||||
|
[Iterable]: Iterable.md
|
||||||
|
[MapEntry]: Map.md
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
# ImmutableSet built-in class
|
||||||
|
|
||||||
|
`ImmutableSet` is an immutable set of unique elements.
|
||||||
|
It implements [Collection] and [Iterable].
|
||||||
|
|
||||||
|
## Creating
|
||||||
|
|
||||||
|
val a = ImmutableSet(1,2,3)
|
||||||
|
val b = Set(1,2,3).toImmutable()
|
||||||
|
val c = [1,2,3].toImmutableSet
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Converting
|
||||||
|
|
||||||
|
val i = ImmutableSet(1,2,3)
|
||||||
|
val m = i.toMutable()
|
||||||
|
m += 4
|
||||||
|
assertEquals( ImmutableSet(1,2,3), i )
|
||||||
|
assertEquals( Set(1,2,3,4), m )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Members
|
||||||
|
|
||||||
|
| name | meaning |
|
||||||
|
|---------------|-----------------------------------------------------|
|
||||||
|
| `size` | number of elements |
|
||||||
|
| `contains(x)` | membership test |
|
||||||
|
| `+`, `union` | union, returns new immutable set |
|
||||||
|
| `-`, `subtract` | subtraction, returns new immutable set |
|
||||||
|
| `*`, `intersect` | intersection, returns new immutable set |
|
||||||
|
| `toMutable()` | create mutable copy |
|
||||||
|
|
||||||
|
[Collection]: Collection.md
|
||||||
|
[Iterable]: Iterable.md
|
||||||
+8
-1
@@ -147,12 +147,15 @@ Search for the first element that satisfies the given predicate:
|
|||||||
| fun/method | description |
|
| fun/method | description |
|
||||||
|------------------------|---------------------------------------------------------------------------------|
|
|------------------------|---------------------------------------------------------------------------------|
|
||||||
| toList() | create a list from iterable |
|
| toList() | create a list from iterable |
|
||||||
|
| toImmutableList() | create an immutable list from iterable |
|
||||||
| toSet() | create a set from iterable |
|
| toSet() | create a set from iterable |
|
||||||
|
| toImmutableSet | create an immutable set from iterable |
|
||||||
| contains(i) | check that iterable contains `i` |
|
| contains(i) | check that iterable contains `i` |
|
||||||
| `i in iterable` | same as `contains(i)` |
|
| `i in iterable` | same as `contains(i)` |
|
||||||
| isEmpty() | check iterable is empty |
|
| isEmpty() | check iterable is empty |
|
||||||
| forEach(f) | call f for each element |
|
| forEach(f) | call f for each element |
|
||||||
| toMap() | create a map from list of key-value pairs (arrays of 2 items or like) |
|
| toMap() | create a map from list of key-value pairs (arrays of 2 items or like) |
|
||||||
|
| toImmutableMap | create an immutable map from list of key-value pairs |
|
||||||
| any(p) | true if any element matches predicate `p` |
|
| any(p) | true if any element matches predicate `p` |
|
||||||
| all(p) | true if all elements match predicate `p` |
|
| all(p) | true if all elements match predicate `p` |
|
||||||
| map(f) | create a list of values returned by `f` called for each element of the iterable |
|
| map(f) | create a list of values returned by `f` called for each element of the iterable |
|
||||||
@@ -206,16 +209,20 @@ For high-performance Kotlin-side interop and custom iterable implementation deta
|
|||||||
|
|
||||||
## Implemented in classes:
|
## Implemented in classes:
|
||||||
|
|
||||||
- [List], [Range], [Buffer](Buffer.md), [BitBuffer], [Buffer], [Set], [RingBuffer]
|
- [List], [ImmutableList], [Range], [Buffer](Buffer.md), [BitBuffer], [Buffer], [Set], [ImmutableSet], [Map], [ImmutableMap], [RingBuffer]
|
||||||
|
|
||||||
[Collection]: Collection.md
|
[Collection]: Collection.md
|
||||||
|
|
||||||
[List]: List.md
|
[List]: List.md
|
||||||
|
[ImmutableList]: ImmutableList.md
|
||||||
|
|
||||||
[Flow]: parallelism.md#flow
|
[Flow]: parallelism.md#flow
|
||||||
|
|
||||||
[Range]: Range.md
|
[Range]: Range.md
|
||||||
|
|
||||||
[Set]: Set.md
|
[Set]: Set.md
|
||||||
|
[ImmutableSet]: ImmutableSet.md
|
||||||
|
[Map]: Map.md
|
||||||
|
[ImmutableMap]: ImmutableMap.md
|
||||||
|
|
||||||
[RingBuffer]: RingBuffer.md
|
[RingBuffer]: RingBuffer.md
|
||||||
@@ -1,6 +1,8 @@
|
|||||||
# List built-in class
|
# List built-in class
|
||||||
|
|
||||||
Mutable list of any objects.
|
Mutable list of any objects.
|
||||||
|
For immutable list values, see [ImmutableList].
|
||||||
|
For observable mutable lists and change hooks, see [ObservableList].
|
||||||
|
|
||||||
It's class in Lyng is `List`:
|
It's class in Lyng is `List`:
|
||||||
|
|
||||||
@@ -179,6 +181,50 @@ for `sort()` will be `sort { a, b -> a <=> b }
|
|||||||
|
|
||||||
It inherits from [Iterable] too and thus all iterable methods are applicable to any list.
|
It inherits from [Iterable] too and thus all iterable methods are applicable to any list.
|
||||||
|
|
||||||
|
## Observable list hooks
|
||||||
|
|
||||||
|
Observable hooks are provided by module `lyng.observable` and are opt-in:
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
|
||||||
|
val src = [1,2,3]
|
||||||
|
val xs = src.observable()
|
||||||
|
assert(xs is ObservableList<Int>)
|
||||||
|
|
||||||
|
var before = 0
|
||||||
|
var after = 0
|
||||||
|
xs.beforeChange { before++ }
|
||||||
|
xs.onChange { after++ }
|
||||||
|
|
||||||
|
xs += 4
|
||||||
|
xs[0] = 100
|
||||||
|
assertEquals([100,2,3,4], xs)
|
||||||
|
assertEquals(2, before)
|
||||||
|
assertEquals(2, after)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
`beforeChange` runs before mutation commit and may reject it by throwing exception (typically `ChangeRejectionException` from the same module):
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
val xs = [1,2].observable()
|
||||||
|
xs.beforeChange { throw ChangeRejectionException("read only") }
|
||||||
|
assertThrows(ChangeRejectionException) { xs += 3 }
|
||||||
|
assertEquals([1,2], xs)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
`changes()` returns `Flow<ListChange<T>>` of committed events:
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
val xs = [10,20].observable()
|
||||||
|
val it = xs.changes().iterator()
|
||||||
|
xs += 30
|
||||||
|
assert(it.hasNext())
|
||||||
|
val e = it.next()
|
||||||
|
assert(e is ListInsert<Int>)
|
||||||
|
assertEquals([30], (e as ListInsert<Int>).values)
|
||||||
|
it.cancelIteration()
|
||||||
|
>>> void
|
||||||
|
|
||||||
## Member inherited from Array
|
## Member inherited from Array
|
||||||
|
|
||||||
| name | meaning | type |
|
| name | meaning | type |
|
||||||
@@ -197,3 +243,5 @@ It inherits from [Iterable] too and thus all iterable methods are applicable to
|
|||||||
[Range]: Range.md
|
[Range]: Range.md
|
||||||
|
|
||||||
[Iterable]: Iterable.md
|
[Iterable]: Iterable.md
|
||||||
|
[ImmutableList]: ImmutableList.md
|
||||||
|
[ObservableList]: ObservableList.md
|
||||||
@@ -3,6 +3,7 @@
|
|||||||
Map is a mutable collection of key-value pairs, where keys are unique. You can create maps in two ways:
|
Map is a mutable collection of key-value pairs, where keys are unique. You can create maps in two ways:
|
||||||
- with the constructor `Map(...)` or `.toMap()` helpers; and
|
- with the constructor `Map(...)` or `.toMap()` helpers; and
|
||||||
- with map literals using braces: `{ "key": value, id: expr, id: }`.
|
- with map literals using braces: `{ "key": value, id: expr, id: }`.
|
||||||
|
For immutable map values, see [ImmutableMap].
|
||||||
|
|
||||||
When constructing from a list, each list item must be a [Collection] with exactly 2 elements, for example, a [List].
|
When constructing from a list, each list item must be a [Collection] with exactly 2 elements, for example, a [List].
|
||||||
|
|
||||||
@@ -177,3 +178,4 @@ Notes:
|
|||||||
- When you need computed or non-string keys, use the constructor form `Map(...)`, map literals with computed keys (if supported), or build entries with `=>` and then merge.
|
- When you need computed or non-string keys, use the constructor form `Map(...)`, map literals with computed keys (if supported), or build entries with `=>` and then merge.
|
||||||
|
|
||||||
[Collection](Collection.md)
|
[Collection](Collection.md)
|
||||||
|
[ImmutableMap]: ImmutableMap.md
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
# ObservableList module
|
||||||
|
|
||||||
|
`ObservableList` lives in explicit module `lyng.observable`.
|
||||||
|
|
||||||
|
Import it first:
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Create from a regular mutable list:
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
val xs = [1,2,3].observable()
|
||||||
|
assert(xs is ObservableList<Int>)
|
||||||
|
assertEquals([1,2,3], xs)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Hook flow
|
||||||
|
|
||||||
|
Event order is:
|
||||||
|
1. `beforeChange(change)` listeners
|
||||||
|
2. mutation commit
|
||||||
|
3. `onChange(change)` listeners
|
||||||
|
4. `changes()` flow emission
|
||||||
|
|
||||||
|
Rejection is done by throwing in `beforeChange`.
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
val xs = [1,2].observable()
|
||||||
|
xs.beforeChange {
|
||||||
|
throw ChangeRejectionException("no mutation")
|
||||||
|
}
|
||||||
|
assertThrows(ChangeRejectionException) { xs += 3 }
|
||||||
|
assertEquals([1,2], xs)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Subscriptions
|
||||||
|
|
||||||
|
`beforeChange` and `onChange` return `Subscription`.
|
||||||
|
Call `cancel()` to unsubscribe.
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
val xs = [1].observable()
|
||||||
|
var hits = 0
|
||||||
|
val sub = xs.onChange { hits++ }
|
||||||
|
xs += 2
|
||||||
|
sub.cancel()
|
||||||
|
xs += 3
|
||||||
|
assertEquals(1, hits)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
## Change events
|
||||||
|
|
||||||
|
`changes()` returns `Flow<ListChange<T>>` with concrete event classes:
|
||||||
|
- `ListInsert`
|
||||||
|
- `ListSet`
|
||||||
|
- `ListRemove`
|
||||||
|
- `ListClear`
|
||||||
|
- `ListReorder`
|
||||||
|
|
||||||
|
import lyng.observable
|
||||||
|
val xs = [10,20].observable()
|
||||||
|
val it = xs.changes().iterator()
|
||||||
|
xs[1] = 200
|
||||||
|
val ev = it.next()
|
||||||
|
assert(ev is ListSet<Int>)
|
||||||
|
assertEquals(20, (ev as ListSet<Int>).oldValue)
|
||||||
|
assertEquals(200, ev.newValue)
|
||||||
|
it.cancelIteration()
|
||||||
|
>>> void
|
||||||
+3
-1
@@ -1,7 +1,8 @@
|
|||||||
# List built-in class
|
# Set built-in class
|
||||||
|
|
||||||
Mutable set of any objects: a group of different objects, no repetitions.
|
Mutable set of any objects: a group of different objects, no repetitions.
|
||||||
Sets are not ordered, order of appearance does not matter.
|
Sets are not ordered, order of appearance does not matter.
|
||||||
|
For immutable set values, see [ImmutableSet].
|
||||||
|
|
||||||
val set = Set(1,2,3, "foo")
|
val set = Set(1,2,3, "foo")
|
||||||
assert( 1 in set )
|
assert( 1 in set )
|
||||||
@@ -92,3 +93,4 @@ Also, it inherits methods from [Iterable].
|
|||||||
|
|
||||||
|
|
||||||
[Range]: Range.md
|
[Range]: Range.md
|
||||||
|
[ImmutableSet]: ImmutableSet.md
|
||||||
@@ -0,0 +1,219 @@
|
|||||||
|
# Lyng Language Reference for AI Agents (Current Compiler State)
|
||||||
|
|
||||||
|
Purpose: dense, implementation-first reference for generating valid Lyng code.
|
||||||
|
|
||||||
|
Primary sources used: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/{Parser,Token,Compiler,Script,TypeDecl}.kt`, `lynglib/stdlib/lyng/root.lyng`, tests in `lynglib/src/commonTest` and `lynglib/src/jvmTest`.
|
||||||
|
|
||||||
|
## 1. Ground Rules
|
||||||
|
- Resolution is compile-time-first. Avoid runtime name/member lookup assumptions.
|
||||||
|
- `lyng.stdlib` is auto-seeded for normal scripts (default import manager).
|
||||||
|
- Use explicit casts when receiver type is unknown (`Object`/`Obj`).
|
||||||
|
- Prefer modern null-safe operators (`?.`, `?:`/`??`, `?=`, `as?`, `!!`).
|
||||||
|
- Do not rely on fallback opcodes or dynamic member fallback semantics.
|
||||||
|
|
||||||
|
## 2. Lexical Syntax
|
||||||
|
- Comments: `// line`, `/* block */`.
|
||||||
|
- Strings: `"..."` (supports escapes). Multiline string content is normalized by indentation logic.
|
||||||
|
- Supported escapes: `\n`, `\r`, `\t`, `\"`, `\\`, `\uXXXX` (4 hex digits).
|
||||||
|
- Unicode escapes use exactly 4 hex digits (for example: `"\u0416"` -> `Ж`).
|
||||||
|
- Unknown `\x` escapes in strings are preserved literally as two characters (`\` and `x`).
|
||||||
|
- Numbers: `Int` (`123`, `1_000`), `Real` (`1.2`, `1e3`), hex (`0xFF`).
|
||||||
|
- Char: `'a'`, escaped chars supported.
|
||||||
|
- Supported escapes: `\n`, `\r`, `\t`, `\'`, `\\`, `\uXXXX` (4 hex digits).
|
||||||
|
- Backslash character in a char literal must be written as `'\\'` (forms like `'\'` are invalid).
|
||||||
|
- Labels:
|
||||||
|
- statement label: `loop@ for (...) { ... }`
|
||||||
|
- label reference: `break@loop`, `continue@loop`, `return@fnLabel`
|
||||||
|
- Keywords/tokens include (contextual in many places):
|
||||||
|
- declarations: `fun`/`fn`, `val`, `var`, `class`, `object`, `interface`, `enum`, `type`, `init`
|
||||||
|
- modifiers: `private`, `protected`, `static`, `abstract`, `closed`, `override`, `extern`, `open`
|
||||||
|
- flow: `if`, `else`, `when`, `for`, `while`, `do`, `try`, `catch`, `finally`, `throw`, `return`, `break`, `continue`
|
||||||
|
|
||||||
|
## 3. Literals and Core Expressions
|
||||||
|
- Scalars: `null`, `true`, `false`, `void`.
|
||||||
|
- List literal: `[a, b, c]`, spreads with `...`.
|
||||||
|
- Spread positions: beginning, middle, end are all valid: `[...a]`, `[0, ...a, 4]`, `[head, ...mid, tail]`.
|
||||||
|
- Spread source must be a `List` at runtime (non-list spread raises an error).
|
||||||
|
- Map literal: `{ key: value, x:, ...otherMap }`.
|
||||||
|
- `x:` means shorthand `x: x`.
|
||||||
|
- Map spread source must be a `Map`.
|
||||||
|
- Range literals:
|
||||||
|
- inclusive: `a..b`
|
||||||
|
- exclusive end: `a..<b`
|
||||||
|
- open-ended forms are supported (`a..`, `..b`, `..`).
|
||||||
|
- optional step: `a..b step 2`
|
||||||
|
- Lambda literal:
|
||||||
|
- with params: `{ x, y -> x + y }`
|
||||||
|
- implicit `it`: `{ it + 1 }`
|
||||||
|
- Ternary conditional is supported: `cond ? thenExpr : elseExpr`.
|
||||||
|
|
||||||
|
## 3.1 Splats in Calls and Lambdas
|
||||||
|
- Declaration-side variadic parameters use ellipsis suffix:
|
||||||
|
- functions: `fun f(head, tail...) { ... }`
|
||||||
|
- lambdas: `{ x, rest... -> ... }`
|
||||||
|
- Call-side splats use `...expr` and are expanded by argument kind:
|
||||||
|
- positional splat: `f(...[1,2,3])`
|
||||||
|
- named splat: `f(...{ a: 1, b: 2 })` (map-style)
|
||||||
|
- Runtime acceptance for splats:
|
||||||
|
- positional splat accepts `List` and general `Iterable` (iterable is converted to list first).
|
||||||
|
- named splat accepts `Map` with string keys only.
|
||||||
|
- Ordering/validation rules (enforced):
|
||||||
|
- positional argument cannot follow named arguments (except trailing-block parsing case).
|
||||||
|
- positional splat cannot follow named arguments.
|
||||||
|
- duplicate named arguments are errors (including duplicates introduced via named splat).
|
||||||
|
- unknown named parameters are errors.
|
||||||
|
- variadic parameter itself cannot be passed as a named argument (`fun g(args..., tail)` then `g(args: ...)` is invalid).
|
||||||
|
- Trailing block + named arguments:
|
||||||
|
- if the last callable parameter is already provided by name in parentheses, adding a trailing block is invalid.
|
||||||
|
|
||||||
|
## 4. Operators (implemented)
|
||||||
|
- Assignment: `=`, `+=`, `-=`, `*=`, `/=`, `%=`, `?=`.
|
||||||
|
- Logical: `||`, `&&`, unary `!`.
|
||||||
|
- Bitwise: `|`, `^`, `&`, `~`, shifts `<<`, `>>`.
|
||||||
|
- Equality/comparison: `==`, `!=`, `===`, `!==`, `<`, `<=`, `>`, `>=`, `<=>`, `=~`, `!~`.
|
||||||
|
- Type/containment: `is`, `!is`, `in`, `!in`, `as`, `as?`.
|
||||||
|
- Null-safe family:
|
||||||
|
- member access: `?.`
|
||||||
|
- safe index: `?[i]`
|
||||||
|
- safe invoke: `?(...)`
|
||||||
|
- safe block invoke: `?{ ... }`
|
||||||
|
- elvis: `?:` and `??`.
|
||||||
|
- Increment/decrement: prefix and postfix `++`, `--`.
|
||||||
|
|
||||||
|
## 5. Declarations
|
||||||
|
- Variables:
|
||||||
|
- `val` immutable, `var` mutable.
|
||||||
|
- top-level/local `val` must be initialized.
|
||||||
|
- class `val` may be late-initialized, but must be assigned in class body/init before class parse ends.
|
||||||
|
- destructuring declaration: `val [a, b, rest...] = expr`.
|
||||||
|
- destructuring declaration details:
|
||||||
|
- allowed in `val` and `var` declarations.
|
||||||
|
- supports nested patterns: `val [a, [b, c...], d] = rhs`.
|
||||||
|
- supports at most one splat (`...`) per pattern level.
|
||||||
|
- RHS must be a `List`.
|
||||||
|
- without splat: RHS must have at least as many elements as pattern arity.
|
||||||
|
- with splat: head/tail elements are bound directly, splat receives a `List`.
|
||||||
|
- Functions:
|
||||||
|
- `fun` and `fn` are equivalent.
|
||||||
|
- full body: `fun f(x) { ... }`
|
||||||
|
- shorthand: `fun f(x) = expr`.
|
||||||
|
- generics: `fun f<T>(x: T): T`.
|
||||||
|
- extension functions: `fun Type.name(...) { ... }`.
|
||||||
|
- delegated callable: `fun f(...) by delegate`.
|
||||||
|
- Type aliases:
|
||||||
|
- `type Name = TypeExpr`
|
||||||
|
- generic: `type Box<T> = List<T>`
|
||||||
|
- aliases are expanded structurally.
|
||||||
|
- Classes/objects/enums/interfaces:
|
||||||
|
- `interface` is parsed as abstract class synonym.
|
||||||
|
- `object` supports named singleton and anonymous object expression forms.
|
||||||
|
- enums support lifted entries: `enum E* { A, B }`.
|
||||||
|
- multiple inheritance is supported; override is enforced when overriding base members.
|
||||||
|
- Properties/accessors in class body:
|
||||||
|
- accessor form supports `get`/`set`, including `private set`/`protected set`.
|
||||||
|
|
||||||
|
## 6. Control Flow
|
||||||
|
- `if` is expression-like.
|
||||||
|
- `when(value) { ... }` supported.
|
||||||
|
- branch conditions support equality, `in`, `!in`, `is`, `!is`, and `nullable` predicate.
|
||||||
|
- `when { ... }` (subject-less) is currently not implemented.
|
||||||
|
- Loops: `for`, `while`, `do ... while`.
|
||||||
|
- loop `else` blocks are supported.
|
||||||
|
- `break value` can return a loop result.
|
||||||
|
- Exceptions: `try/catch/finally`, `throw`.
|
||||||
|
|
||||||
|
## 6.1 Destructuring Assignment (implemented)
|
||||||
|
- Reassignment form is supported (not only declaration):
|
||||||
|
- `[x, y] = [y, x]`
|
||||||
|
- Semantics match destructuring declaration:
|
||||||
|
- nested patterns allowed.
|
||||||
|
- at most one splat per pattern level.
|
||||||
|
- RHS must be a `List`.
|
||||||
|
- too few RHS elements raises runtime error.
|
||||||
|
- Targets in pattern are variables parsed from identifier patterns.
|
||||||
|
|
||||||
|
## 7. Type System (current behavior)
|
||||||
|
- Non-null by default (`T`), nullable with `T?`.
|
||||||
|
- `as` (checked cast), `as?` (safe cast returning `null`), `!!` non-null assertion.
|
||||||
|
- Type expressions support:
|
||||||
|
- unions `A | B`
|
||||||
|
- intersections `A & B`
|
||||||
|
- function types `(A, B)->R` and receiver form `Receiver.(A)->R`
|
||||||
|
- variadics in function type via ellipsis (`T...`)
|
||||||
|
- Generics:
|
||||||
|
- type params on classes/functions/type aliases
|
||||||
|
- bounds via `:` with union/intersection expressions
|
||||||
|
- declaration-site variance via `in` / `out`
|
||||||
|
- Generic function/class/type syntax examples:
|
||||||
|
- function: `fun choose<T>(a: T, b: T): T = a`
|
||||||
|
- class: `class Box<T>(val value: T)`
|
||||||
|
- alias: `type PairList<T> = List<List<T>>`
|
||||||
|
- Untyped params default to `Object` (`x`) or `Object?` (`x?` shorthand).
|
||||||
|
- Untyped `var x` starts as `Unset`; first assignment fixes type tracking in compiler.
|
||||||
|
|
||||||
|
## 7.1 Generics Runtime Model and Bounds (AI-critical)
|
||||||
|
- Lyng generic type information is operational in script execution contexts; do not assume JVM-style full erasure.
|
||||||
|
- Generic call type arguments can be:
|
||||||
|
- explicit at call site (`f<Int>(1)` style),
|
||||||
|
- inferred from runtime values/declared arg types,
|
||||||
|
- defaulted from type parameter defaults (or `Any` fallback).
|
||||||
|
- At function execution, generic type parameters are runtime-bound as constants in scope:
|
||||||
|
- simple non-null class-like types are bound as `ObjClass`,
|
||||||
|
- complex/nullable/union/intersection forms are bound as `ObjTypeExpr`.
|
||||||
|
- Practical implication for generated code:
|
||||||
|
- inside generic code, treat type params as usable type objects in `is`/`in`/type-expression logic (not as purely compile-time placeholders).
|
||||||
|
- example pattern: `if (value is T) { ... }`.
|
||||||
|
- Bound syntax (implemented):
|
||||||
|
- intersection bound: `fun f<T: A & B>(x: T) { ... }`
|
||||||
|
- union bound: `fun g<T: A | B>(x: T) { ... }`
|
||||||
|
- Bound checks happen at two points:
|
||||||
|
- compile-time call checking for resolvable generic calls,
|
||||||
|
- runtime re-check while binding type params for actual invocation.
|
||||||
|
- Bound satisfaction is currently class-hierarchy based for class-resolvable parts (including union/intersection combination rules).
|
||||||
|
- Keep expectations realistic:
|
||||||
|
- extern-generic runtime ABI for full instance-level generic metadata is still proposal-level (`proposals/extern_generic_runtime_abi.md`), so avoid assuming fully materialized generic-instance metadata everywhere.
|
||||||
|
|
||||||
|
## 7.2 Differences vs Java / Kotlin / Scala
|
||||||
|
- Java:
|
||||||
|
- Java generics are erased at runtime (except reflection metadata and raw `Class` tokens).
|
||||||
|
- Lyng generic params in script execution are runtime-bound type objects, so generated code can reason about `T` directly.
|
||||||
|
- Kotlin:
|
||||||
|
- Kotlin on JVM is mostly erased; full runtime type access usually needs `inline reified`.
|
||||||
|
- Lyng generic function execution binds `T` without requiring an inline/reified escape hatch.
|
||||||
|
- Scala:
|
||||||
|
- Scala has richer static typing but still runs on JVM erasure model unless carrying explicit runtime evidence (`TypeTag`, etc.).
|
||||||
|
- Lyng exposes runtime-bound type expressions/classes directly in generic execution scope.
|
||||||
|
- AI generation rule:
|
||||||
|
- do not port JVM-language assumptions like “`T` unavailable at runtime unless reified/tagged”.
|
||||||
|
- in Lyng, prefer direct type-expression-driven branching when useful, but avoid assuming extern object generic args are always introspectable today.
|
||||||
|
|
||||||
|
## 8. OOP, Members, and Dispatch
|
||||||
|
- Multiple inheritance with C3-style linearization behavior is implemented in class machinery.
|
||||||
|
- Disambiguation helpers are supported:
|
||||||
|
- qualified this: `this@Base.member()`
|
||||||
|
- cast view: `(obj as Base).member()`
|
||||||
|
- On unknown receiver types, compiler allows only Object-safe members:
|
||||||
|
- `toString`, `toInspectString`, `let`, `also`, `apply`, `run`
|
||||||
|
- Other members require known receiver type or explicit cast.
|
||||||
|
|
||||||
|
## 9. Delegation (`by`)
|
||||||
|
- Works for `val`, `var`, and `fun`.
|
||||||
|
- Expected delegate hooks in practice:
|
||||||
|
- `getValue(thisRef, name)`
|
||||||
|
- `setValue(thisRef, name, newValue)`
|
||||||
|
- `invoke(thisRef, name, args...)` for delegated callables
|
||||||
|
- optional `bind(name, access, thisRef)`
|
||||||
|
- `@Transient` is recognized for declarations/params and affects serialization/equality behavior.
|
||||||
|
|
||||||
|
## 10. Modules and Imports
|
||||||
|
- `package` and `import module.name` are supported.
|
||||||
|
- Import form is module-only (no aliasing/selective import syntax in parser).
|
||||||
|
- Default module ecosystem includes:
|
||||||
|
- auto-seeded: `lyng.stdlib`
|
||||||
|
- available by import: `lyng.observable`, `lyng.buffer`, `lyng.serialization`, `lyng.time`
|
||||||
|
- extra module (when installed): `lyng.io.fs`, `lyng.io.process`
|
||||||
|
|
||||||
|
## 11. Current Limitations / Avoid
|
||||||
|
- No subject-less `when { ... }` yet.
|
||||||
|
- No regex literal tokenization (`/.../`); use `Regex("...")` or `"...".re`.
|
||||||
|
- Do not generate runtime name fallback patterns from legacy docs.
|
||||||
@@ -0,0 +1,75 @@
|
|||||||
|
# Lyng Stdlib Reference for AI Agents (Compact)
|
||||||
|
|
||||||
|
Purpose: fast overview of what is available by default and what must be imported.
|
||||||
|
|
||||||
|
Sources: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Script.kt`, `lynglib/stdlib/lyng/root.lyng`, `lynglib/src/commonMain/kotlin/net/sergeych/lyng/stdlib_included/observable_lyng.kt`.
|
||||||
|
|
||||||
|
## 1. Default Availability
|
||||||
|
- Normal scripts are auto-seeded with `lyng.stdlib` (default import manager path).
|
||||||
|
- Root runtime scope also exposes global constants/functions directly.
|
||||||
|
|
||||||
|
## 2. Core Global Functions (Root Scope)
|
||||||
|
- IO/debug: `print`, `println`, `traceScope`.
|
||||||
|
- Invocation/util: `call`, `run`, `dynamic`, `cached`, `lazy`.
|
||||||
|
- Assertions/tests: `assert`, `assertEquals`/`assertEqual`, `assertNotEquals`, `assertThrows`.
|
||||||
|
- Preconditions: `require`, `check`.
|
||||||
|
- Async/concurrency: `launch`, `yield`, `flow`, `delay`.
|
||||||
|
- Math: `floor`, `ceil`, `round`, `sin`, `cos`, `tan`, `asin`, `acos`, `atan`, `sinh`, `cosh`, `tanh`, `asinh`, `acosh`, `atanh`, `exp`, `ln`, `log10`, `log2`, `pow`, `sqrt`, `abs`, `clamp`.
|
||||||
|
|
||||||
|
## 3. Core Global Constants/Types
|
||||||
|
- Values: `Unset`, `π`.
|
||||||
|
- Primitive/class symbols: `Object`, `Int`, `Real`, `Bool`, `Char`, `String`, `Class`, `Callable`.
|
||||||
|
- Collections/types: `Iterable`, `Iterator`, `Collection`, `Array`, `List`, `ImmutableList`, `Set`, `ImmutableSet`, `Map`, `ImmutableMap`, `MapEntry`, `Range`, `RingBuffer`.
|
||||||
|
- Random: singleton `Random` and class `SeededRandom`.
|
||||||
|
- Async types: `Deferred`, `CompletableDeferred`, `Mutex`, `Flow`, `FlowBuilder`.
|
||||||
|
- Delegation types: `Delegate`, `DelegateContext`.
|
||||||
|
- Regex types: `Regex`, `RegexMatch`.
|
||||||
|
- Also present: `Math.PI` namespace constant.
|
||||||
|
|
||||||
|
## 4. `lyng.stdlib` Module Surface (from `root.lyng`)
|
||||||
|
### 4.1 Extern class declarations
|
||||||
|
- Exceptions/delegation base: `Exception`, `IllegalArgumentException`, `NotImplementedException`, `Delegate`.
|
||||||
|
- Collections and iterables: `Iterable<T>`, `Iterator<T>`, `Collection<T>`, `Array<T>`, `List<T>`, `ImmutableList<T>`, `Set<T>`, `ImmutableSet<T>`, `Map<K,V>`, `ImmutableMap<K,V>`, `MapEntry<K,V>`, `RingBuffer<T>`.
|
||||||
|
- Host iterator bridge: `KotlinIterator<T>`.
|
||||||
|
- Random APIs: `extern object Random`, `extern class SeededRandom`.
|
||||||
|
|
||||||
|
### 4.2 High-use extension APIs
|
||||||
|
- Iteration/filtering: `forEach`, `filter`, `filterFlow`, `filterNotNull`, `filterFlowNotNull`, `drop`, `dropLast`, `takeLast`.
|
||||||
|
- Search/predicates: `findFirst`, `findFirstOrNull`, `any`, `all`, `count`, `first`, `last`.
|
||||||
|
- Mapping/aggregation: `map`, `flatMap`, `flatten`, `sum`, `sumOf`, `minOf`, `maxOf`.
|
||||||
|
- Ordering: `sorted`, `sortedBy`, `shuffled`, `List.sort`, `List.sortBy`.
|
||||||
|
- String helper: `joinToString`, `String.re`.
|
||||||
|
|
||||||
|
### 4.3 Delegation helpers
|
||||||
|
- `enum DelegateAccess { Val, Var, Callable }`
|
||||||
|
- `interface Delegate<T,ThisRefType=void>` with `getValue`, `setValue`, `invoke`, `bind`.
|
||||||
|
- `class lazy<T,...>` delegate implementation.
|
||||||
|
- `fun with(self, block)` helper.
|
||||||
|
|
||||||
|
### 4.4 Other module-level symbols
|
||||||
|
- `$~` (last regex match object).
|
||||||
|
- `TODO(message?)` utility.
|
||||||
|
- `StackTraceEntry` class.
|
||||||
|
- `Random.nextInt()`, `Random.nextFloat()`, `Random.next(range)`, `Random.seeded(seed)`.
|
||||||
|
- `SeededRandom.nextInt()`, `SeededRandom.nextFloat()`, `SeededRandom.next(range)`.
|
||||||
|
|
||||||
|
## 5. Additional Built-in Modules (import explicitly)
|
||||||
|
- `import lyng.observable`
|
||||||
|
- `Observable`, `Subscription`, `ObservableList`, `ListChange` and change subtypes, `ChangeRejectionException`.
|
||||||
|
- `import lyng.buffer`
|
||||||
|
- `Buffer`, `MutableBuffer`.
|
||||||
|
- `import lyng.serialization`
|
||||||
|
- `Lynon` serialization utilities.
|
||||||
|
- `import lyng.time`
|
||||||
|
- `Instant`, `DateTime`, `Duration`, and module `delay`.
|
||||||
|
|
||||||
|
## 6. Optional (lyngio) Modules
|
||||||
|
Requires installing `lyngio` into the import manager from host code.
|
||||||
|
- `import lyng.io.fs` (filesystem `Path` API)
|
||||||
|
- `import lyng.io.process` (process execution API)
|
||||||
|
- `import lyng.io.console` (console capabilities, geometry, ANSI/output, events)
|
||||||
|
|
||||||
|
## 7. AI Generation Tips
|
||||||
|
- Assume `lyng.stdlib` APIs exist in regular script contexts.
|
||||||
|
- For platform-sensitive code (`fs`, `process`, `console`), gate assumptions and mention required module install.
|
||||||
|
- Prefer extension-method style (`items.filter { ... }`) and standard scope helpers (`let`/`also`/`apply`/`run`).
|
||||||
+132
-35
@@ -4,7 +4,7 @@ Lyng is a tiny, embeddable, Kotlin‑first scripting language. This page shows,
|
|||||||
|
|
||||||
- add Lyng to your build
|
- add Lyng to your build
|
||||||
- create a runtime and execute scripts
|
- create a runtime and execute scripts
|
||||||
- define functions and variables from Kotlin
|
- declare extern globals in Lyng and bind them from Kotlin
|
||||||
- read variable values back in Kotlin
|
- read variable values back in Kotlin
|
||||||
- call Lyng functions from Kotlin
|
- call Lyng functions from Kotlin
|
||||||
- create your own packages and import them in Lyng
|
- create your own packages and import them in Lyng
|
||||||
@@ -65,30 +65,74 @@ val run2 = script.execute(scope)
|
|||||||
|
|
||||||
`Scope.eval("...")` is a shortcut that compiles and executes on the given scope.
|
`Scope.eval("...")` is a shortcut that compiles and executes on the given scope.
|
||||||
|
|
||||||
### 3) Define variables from Kotlin
|
### 3) Preferred: bind extern globals from Kotlin
|
||||||
|
|
||||||
To expose data to Lyng, add constants (read‑only) or mutable variables to the scope. All values in Lyng are `Obj` instances; the core types live in `net.sergeych.lyng.obj`.
|
For module-level APIs, the default workflow is:
|
||||||
|
|
||||||
|
1. declare globals in Lyng using `extern fun` / `extern val` / `extern var`;
|
||||||
|
2. bind Kotlin implementation via `ModuleScope.globalBinder()`.
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
// Read‑only constant
|
import net.sergeych.lyng.bridge.*
|
||||||
scope.addConst("pi", ObjReal(3.14159))
|
import net.sergeych.lyng.obj.ObjInt
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
|
||||||
// Mutable variable: create or update
|
val im = Script.defaultImportManager.copy()
|
||||||
scope.addOrUpdateItem("counter", ObjInt(0))
|
im.addPackage("my.api") { module ->
|
||||||
|
module.eval("""
|
||||||
|
extern fun globalFun(v: Int): Int
|
||||||
|
extern var globalProp: String
|
||||||
|
extern val globalVersion: String
|
||||||
|
""".trimIndent())
|
||||||
|
|
||||||
// Use it from Lyng
|
val binder = module.globalBinder()
|
||||||
scope.eval("counter = counter + 1")
|
|
||||||
|
binder.bindGlobalFun1<Int>("globalFun") { v ->
|
||||||
|
ObjInt.of((v + 1).toLong())
|
||||||
|
}
|
||||||
|
|
||||||
|
var prop = "initial"
|
||||||
|
binder.bindGlobalVar(
|
||||||
|
name = "globalProp",
|
||||||
|
get = { prop },
|
||||||
|
set = { prop = it }
|
||||||
|
)
|
||||||
|
|
||||||
|
binder.bindGlobalVar(
|
||||||
|
name = "globalVersion",
|
||||||
|
get = { "1.0.0" } // readonly: setter omitted
|
||||||
|
)
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Tip: Lyng values can be converted back to Kotlin with `toKotlin(scope)`:
|
Usage from Lyng:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
import my.api
|
||||||
|
|
||||||
|
assertEquals(42, globalFun(41))
|
||||||
|
assertEquals("initial", globalProp)
|
||||||
|
globalProp = "changed"
|
||||||
|
assertEquals("changed", globalProp)
|
||||||
|
assertEquals("1.0.0", globalVersion)
|
||||||
|
```
|
||||||
|
|
||||||
|
For custom argument handling and full runtime access:
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
val current = (scope.eval("counter")).toKotlin(scope) // Any? (e.g., Int/Double/String/List)
|
binder.bindGlobalFun("sum3") {
|
||||||
|
requireExactCount(3)
|
||||||
|
ObjInt.of((int(0) + int(1) + int(2)).toLong())
|
||||||
|
}
|
||||||
|
|
||||||
|
binder.bindGlobalFunRaw("echoRaw") { _, args ->
|
||||||
|
args.firstAndOnly()
|
||||||
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
### 4) Add Kotlin‑backed functions
|
### 4) Low-level: direct functions/variables from Kotlin
|
||||||
|
|
||||||
Use `Scope.addFn`/`addVoidFn` to register functions implemented in Kotlin. Inside the lambda, use `this.args` to access arguments and return an `Obj`.
|
Use this when you intentionally want raw `Scope` APIs. For most module APIs, prefer section 3.
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
// A function returning value
|
// A function returning value
|
||||||
@@ -199,6 +243,12 @@ For extensions and libraries, the **preferred** workflow is Lyng‑first: declar
|
|||||||
|
|
||||||
This keeps Lyng semantics (visibility, overrides, type checks) in Lyng, while Kotlin supplies the behavior.
|
This keeps Lyng semantics (visibility, overrides, type checks) in Lyng, while Kotlin supplies the behavior.
|
||||||
|
|
||||||
|
Pure extern declarations use the simplified rule set:
|
||||||
|
- `extern class` / `extern object` are declaration-only ABI surfaces.
|
||||||
|
- Every member in their body is implicitly extern (you may still write `extern`, but it is redundant).
|
||||||
|
- Plain Lyng member implementations inside `extern class` / `extern object` are not allowed.
|
||||||
|
- Put Lyng behavior into regular classes or extension methods.
|
||||||
|
|
||||||
```lyng
|
```lyng
|
||||||
// Lyng side (in a module)
|
// Lyng side (in a module)
|
||||||
class Counter {
|
class Counter {
|
||||||
@@ -207,7 +257,22 @@ class Counter {
|
|||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Note: members must be marked `extern` so the compiler emits the ABI slots that Kotlin bindings attach to. This applies to functions and properties bound via `addFun` / `addVal` / `addVar`.
|
Note: members of `extern class` / `extern object` are treated as extern by default, so the compiler emits ABI slots that Kotlin bindings attach to. This applies to functions and properties bound via `addFun` / `addVal` / `addVar`.
|
||||||
|
|
||||||
|
Example of pure extern class declaration:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
extern class HostCounter {
|
||||||
|
var value: Int
|
||||||
|
fun inc(by: Int): Int
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
If you need Lyng-side convenience behavior, add it as an extension:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun HostCounter.bump() = inc(1)
|
||||||
|
```
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
// Kotlin side (binding)
|
// Kotlin side (binding)
|
||||||
@@ -217,14 +282,14 @@ moduleScope.eval("class Counter { extern var value: Int; extern fun inc(by: Int)
|
|||||||
moduleScope.bind("Counter") {
|
moduleScope.bind("Counter") {
|
||||||
addVar(
|
addVar(
|
||||||
name = "value",
|
name = "value",
|
||||||
get = { _, self -> self.readField(this, "value").value },
|
get = { thisObj.readField(this, "value").value },
|
||||||
set = { _, self, v -> self.writeField(this, "value", v) }
|
set = { v -> thisObj.writeField(this, "value", v) }
|
||||||
)
|
)
|
||||||
addFun("inc") { _, self, args ->
|
addFun("inc") {
|
||||||
val by = args.requiredArg<ObjInt>(0).value
|
val by = args.requiredArg<ObjInt>(0).value
|
||||||
val current = self.readField(this, "value").value as ObjInt
|
val current = thisObj.readField(this, "value").value as ObjInt
|
||||||
val next = ObjInt(current.value + by)
|
val next = ObjInt(current.value + by)
|
||||||
self.writeField(this, "value", next)
|
thisObj.writeField(this, "value", next)
|
||||||
next
|
next
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -240,41 +305,62 @@ Notes:
|
|||||||
|
|
||||||
For `extern object` declarations, bind implementations to the singleton instance using `ModuleScope.bindObject`.
|
For `extern object` declarations, bind implementations to the singleton instance using `ModuleScope.bindObject`.
|
||||||
This mirrors class binding but targets an already created object instance.
|
This mirrors class binding but targets an already created object instance.
|
||||||
|
As with class binding, you must first add/evaluate the Lyng declaration into that module scope, then bind Kotlin handlers.
|
||||||
|
|
||||||
```lyng
|
```kotlin
|
||||||
// Lyng side (in a module)
|
// Kotlin side (binding)
|
||||||
|
val moduleScope = importManager.createModuleScope(Pos.builtIn, "bridge.obj")
|
||||||
|
|
||||||
|
// 1) Seed the module with the Lyng declaration first
|
||||||
|
moduleScope.eval("""
|
||||||
extern object HostObject {
|
extern object HostObject {
|
||||||
extern fun add(a: Int, b: Int): Int
|
extern fun add(a: Int, b: Int): Int
|
||||||
extern val status: String
|
extern val status: String
|
||||||
extern var count: Int
|
extern var count: Int
|
||||||
}
|
}
|
||||||
```
|
""".trimIndent())
|
||||||
|
|
||||||
```kotlin
|
// 2) Then bind Kotlin implementations to that declared object
|
||||||
// Kotlin side (binding)
|
|
||||||
val moduleScope = importManager.createModuleScope(Pos.builtIn, "bridge.obj")
|
|
||||||
moduleScope.bindObject("HostObject") {
|
moduleScope.bindObject("HostObject") {
|
||||||
classData = "OK"
|
classData = "OK"
|
||||||
init { _ -> data = 0L }
|
init { _ -> data = 0L }
|
||||||
addFun("add") { _, _, args ->
|
addFun("add") {
|
||||||
val a = args.requiredArg<ObjInt>(0).value
|
val a = args.requiredArg<ObjInt>(0).value
|
||||||
val b = args.requiredArg<ObjInt>(1).value
|
val b = args.requiredArg<ObjInt>(1).value
|
||||||
ObjInt.of(a + b)
|
ObjInt.of(a + b)
|
||||||
}
|
}
|
||||||
addVal("status") { _, _ -> ObjString(classData as String) }
|
addVal("status") { ObjString(classData as String) }
|
||||||
addVar(
|
addVar(
|
||||||
"count",
|
"count",
|
||||||
get = { _, inst -> ObjInt.of((inst as ObjInstance).data as Long) },
|
get = { ObjInt.of((thisObj as ObjInstance).data as Long) },
|
||||||
set = { _, inst, value -> (inst as ObjInstance).data = (value as ObjInt).value }
|
set = { value -> (thisObj as ObjInstance).data = (value as ObjInt).value }
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
|
|
||||||
- Members must be marked `extern` so the compiler emits ABI slots for Kotlin bindings.
|
- Required order: declare/eval Lyng object in the module first, then call `bindObject(...)`.
|
||||||
|
This is the pattern covered by `BridgeBindingTest.testExternObjectBinding`.
|
||||||
|
- Members must be extern (explicitly, or implicitly via `extern object`) so the compiler emits ABI slots for Kotlin bindings.
|
||||||
- You can also bind by name/module via `LyngObjectBridge.bind(...)`.
|
- You can also bind by name/module via `LyngObjectBridge.bind(...)`.
|
||||||
|
|
||||||
|
Minimal `extern fun` example:
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
val moduleScope = importManager.createModuleScope(Pos.builtIn, "bridge.ping")
|
||||||
|
|
||||||
|
moduleScope.eval("""
|
||||||
|
extern object HostObject {
|
||||||
|
extern fun ping(): Int
|
||||||
|
}
|
||||||
|
""".trimIndent())
|
||||||
|
|
||||||
|
moduleScope.bindObject("HostObject") {
|
||||||
|
addFun("ping") { ObjInt.of(7) }
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
### 6.6) Preferred: Kotlin reflection bridge for call‑by‑name
|
### 6.6) Preferred: Kotlin reflection bridge for call‑by‑name
|
||||||
|
|
||||||
For Kotlin code that needs dynamic access to Lyng variables, functions, or members, use the bridge resolver.
|
For Kotlin code that needs dynamic access to Lyng variables, functions, or members, use the bridge resolver.
|
||||||
@@ -363,6 +449,9 @@ Key concepts:
|
|||||||
Register a Kotlin‑built package:
|
Register a Kotlin‑built package:
|
||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
|
import net.sergeych.lyng.bridge.*
|
||||||
|
import net.sergeych.lyng.obj.ObjInt
|
||||||
|
|
||||||
val scope = Script.newScope()
|
val scope = Script.newScope()
|
||||||
|
|
||||||
// Access the import manager behind this scope
|
// Access the import manager behind this scope
|
||||||
@@ -370,11 +459,19 @@ val im: ImportManager = scope.importManager
|
|||||||
|
|
||||||
// Register a package "my.tools"
|
// Register a package "my.tools"
|
||||||
im.addPackage("my.tools") { module: ModuleScope ->
|
im.addPackage("my.tools") { module: ModuleScope ->
|
||||||
// Expose symbols inside the module scope
|
module.eval(
|
||||||
module.addConst("version", ObjString("1.0"))
|
"""
|
||||||
module.addFn<ObjInt>("triple") {
|
extern val version: String
|
||||||
val x = args.firstAndOnly() as ObjInt
|
extern fun triple(x: Int): Int
|
||||||
ObjInt(x.value * 3)
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
val binder = module.globalBinder()
|
||||||
|
binder.bindGlobalVar(
|
||||||
|
name = "version",
|
||||||
|
get = { "1.0" }
|
||||||
|
)
|
||||||
|
binder.bindGlobalFun1<Int>("triple") { x ->
|
||||||
|
ObjInt.of((x * 3).toLong())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -109,6 +109,24 @@ Examples (T = A | B):
|
|||||||
B in T // true
|
B in T // true
|
||||||
T is A | B // true
|
T is A | B // true
|
||||||
|
|
||||||
|
# Nullability checks for types
|
||||||
|
|
||||||
|
Use `is nullable` to check whether a type expression accepts `null`:
|
||||||
|
|
||||||
|
T is nullable
|
||||||
|
T !is nullable
|
||||||
|
|
||||||
|
This works with concrete and generic types:
|
||||||
|
|
||||||
|
fun describe<T>(x: T): String = when (T) {
|
||||||
|
nullable -> "nullable"
|
||||||
|
else -> "non-null"
|
||||||
|
}
|
||||||
|
|
||||||
|
Equivalent legacy form:
|
||||||
|
|
||||||
|
null is T
|
||||||
|
|
||||||
# Practical examples
|
# Practical examples
|
||||||
|
|
||||||
fun acceptInts<T: Int>(xs: List<T>) { }
|
fun acceptInts<T: Int>(xs: List<T>) { }
|
||||||
|
|||||||
@@ -9,9 +9,12 @@ should be compatible with other IDEA flavors, notably [OpenIDE](https://openide.
|
|||||||
- reformat code (indents, spaces)
|
- reformat code (indents, spaces)
|
||||||
- reformat on paste
|
- reformat on paste
|
||||||
- smart enter key
|
- smart enter key
|
||||||
|
- `.lyng.d` definition files (merged into analysis for completion, navigation, Quick Docs, and error checking)
|
||||||
|
|
||||||
Features are configurable via the plugin settings page, in system settings.
|
Features are configurable via the plugin settings page, in system settings.
|
||||||
|
|
||||||
|
See `docs/lyng_d_files.md` for `.lyng.d` syntax and examples.
|
||||||
|
|
||||||
> Recommended for IntelliJ-based IDEs: While IntelliJ can import TextMate bundles
|
> Recommended for IntelliJ-based IDEs: While IntelliJ can import TextMate bundles
|
||||||
> (Settings/Preferences → Editor → TextMate Bundles), the native Lyng plugin provides
|
> (Settings/Preferences → Editor → TextMate Bundles), the native Lyng plugin provides
|
||||||
> better support (formatting, smart enter, background analysis, etc.). Prefer installing
|
> better support (formatting, smart enter, background analysis, etc.). Prefer installing
|
||||||
|
|||||||
@@ -0,0 +1,101 @@
|
|||||||
|
### lyng.io.console
|
||||||
|
|
||||||
|
`lyng.io.console` provides optional rich console support for terminal applications.
|
||||||
|
|
||||||
|
> **Note:** this module is part of `lyngio`. It must be explicitly installed into the import manager by host code.
|
||||||
|
>
|
||||||
|
> **CLI note:** the `lyng` CLI now installs `lyng.io.console` in its base scope by default, so scripts can simply `import lyng.io.console`.
|
||||||
|
|
||||||
|
#### Install in host
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
import net.sergeych.lyng.Script
|
||||||
|
import net.sergeych.lyng.io.console.createConsoleModule
|
||||||
|
import net.sergeych.lyngio.console.security.PermitAllConsoleAccessPolicy
|
||||||
|
|
||||||
|
suspend fun initScope() {
|
||||||
|
val scope = Script.newScope()
|
||||||
|
createConsoleModule(PermitAllConsoleAccessPolicy, scope)
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Use in Lyng script
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
import lyng.io.console
|
||||||
|
|
||||||
|
println("supported = " + Console.isSupported())
|
||||||
|
println("tty = " + Console.isTty())
|
||||||
|
println("ansi = " + Console.ansiLevel())
|
||||||
|
println("geometry = " + Console.geometry())
|
||||||
|
|
||||||
|
Console.write("hello\n")
|
||||||
|
Console.home()
|
||||||
|
Console.clear()
|
||||||
|
Console.moveTo(1, 1)
|
||||||
|
Console.clearLine()
|
||||||
|
Console.enterAltScreen()
|
||||||
|
Console.leaveAltScreen()
|
||||||
|
Console.setCursorVisible(true)
|
||||||
|
Console.flush()
|
||||||
|
```
|
||||||
|
|
||||||
|
Interactive sample script in this repo:
|
||||||
|
|
||||||
|
```bash
|
||||||
|
lyng examples/tetris_console.lyng
|
||||||
|
```
|
||||||
|
|
||||||
|
#### API
|
||||||
|
|
||||||
|
- `Console.isSupported(): Bool` — whether console control is available on this platform/runtime.
|
||||||
|
- `Console.isTty(): Bool` — whether output is attached to a TTY.
|
||||||
|
- `Console.ansiLevel(): String` — `NONE`, `BASIC16`, `ANSI256`, `TRUECOLOR`.
|
||||||
|
- `Console.geometry(): ConsoleGeometry?` — `{columns, rows}` as typed object or `null`.
|
||||||
|
- `Console.details(): ConsoleDetails` — consolidated capability object.
|
||||||
|
- `Console.write(text: String)` — writes to console output.
|
||||||
|
- `Console.flush()` — flushes buffered output.
|
||||||
|
- `Console.home()` — moves cursor to top-left.
|
||||||
|
- `Console.clear()` — clears visible screen.
|
||||||
|
- `Console.moveTo(row: Int, column: Int)` — moves cursor to 1-based row/column.
|
||||||
|
- `Console.clearLine()` — clears current line.
|
||||||
|
- `Console.enterAltScreen()` — switch to alternate screen buffer.
|
||||||
|
- `Console.leaveAltScreen()` — return to normal screen buffer.
|
||||||
|
- `Console.setCursorVisible(visible: Bool)` — shows/hides cursor.
|
||||||
|
- `Console.events(): ConsoleEventStream` — endless iterable source of typed events: `ConsoleResizeEvent`, `ConsoleKeyEvent`.
|
||||||
|
- `Console.setRawMode(enabled: Bool): Bool` — requests raw input mode, returns `true` if changed.
|
||||||
|
|
||||||
|
#### Event Iteration
|
||||||
|
|
||||||
|
Use events from a loop, typically in a separate coroutine:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
launch {
|
||||||
|
for (ev in Console.events()) {
|
||||||
|
if (ev is ConsoleKeyEvent) {
|
||||||
|
// handle key
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
#### Event format
|
||||||
|
|
||||||
|
`Console.events()` emits `ConsoleEvent` with at least:
|
||||||
|
|
||||||
|
- `type: String` — `resize`, `keydown`, `keyup`
|
||||||
|
|
||||||
|
Additional fields:
|
||||||
|
|
||||||
|
- `ConsoleResizeEvent`: `columns`, `rows`
|
||||||
|
- `ConsoleKeyEvent`: `key`, `code`, `ctrl`, `alt`, `shift`, `meta`
|
||||||
|
|
||||||
|
#### Security policy
|
||||||
|
|
||||||
|
The module uses `ConsoleAccessPolicy` with operations:
|
||||||
|
|
||||||
|
- `WriteText(length)`
|
||||||
|
- `ReadEvents`
|
||||||
|
- `SetRawMode(enabled)`
|
||||||
|
|
||||||
|
For permissive mode, use `PermitAllConsoleAccessPolicy`.
|
||||||
@@ -0,0 +1,116 @@
|
|||||||
|
# `.lyng.d` Definition Files
|
||||||
|
|
||||||
|
`.lyng.d` files declare Lyng symbols for tooling without shipping runtime implementations. The IntelliJ IDEA plugin merges
|
||||||
|
all `*.lyng.d` files from the current directory and its parent directories into the active file’s analysis, enabling:
|
||||||
|
|
||||||
|
- completion
|
||||||
|
- navigation
|
||||||
|
- error checking for declared symbols
|
||||||
|
- Quick Docs for declarations defined in `.lyng.d`
|
||||||
|
|
||||||
|
Place `*.lyng.d` files next to the code they describe (or in a parent folder). The plugin will pick them up automatically.
|
||||||
|
|
||||||
|
## Writing `.lyng.d` Files
|
||||||
|
|
||||||
|
You can declare any language-level symbol in a `.lyng.d` file. Use doc comments before declarations to make Quick Docs
|
||||||
|
work in the IDE. The doc parser accepts standard comments (`/** ... */` or `// ...`) and supports tags like `@param`.
|
||||||
|
|
||||||
|
### Full Example
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
/** Library entry point */
|
||||||
|
extern fun connect(url: String, timeoutMs: Int = 5000): Client
|
||||||
|
|
||||||
|
/** Type alias with generics */
|
||||||
|
type NameMap = Map<String, String>
|
||||||
|
|
||||||
|
/** Multiple inheritance via interfaces */
|
||||||
|
interface A { abstract fun a(): Int }
|
||||||
|
interface B { abstract fun b(): Int }
|
||||||
|
|
||||||
|
/** A concrete class implementing both */
|
||||||
|
class Multi(name: String) : A, B {
|
||||||
|
/** Public field */
|
||||||
|
val id: Int = 0
|
||||||
|
|
||||||
|
/** Mutable property with accessors */
|
||||||
|
var size: Int
|
||||||
|
get() = 0
|
||||||
|
set(v) { }
|
||||||
|
|
||||||
|
/** Instance method */
|
||||||
|
fun a(): Int = 1
|
||||||
|
fun b(): Int = 2
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Nullable and dynamic types */
|
||||||
|
extern val dynValue: dynamic
|
||||||
|
extern var dynVar: dynamic?
|
||||||
|
|
||||||
|
/** Delegated property */
|
||||||
|
class LazyBox(val create) {
|
||||||
|
fun getValue(thisRef, name) = create()
|
||||||
|
}
|
||||||
|
|
||||||
|
val cached by LazyBox { 42 }
|
||||||
|
|
||||||
|
/** Delegated function */
|
||||||
|
object RpcDelegate {
|
||||||
|
fun invoke(thisRef, name, args...) = Unset
|
||||||
|
}
|
||||||
|
|
||||||
|
fun remoteCall by RpcDelegate
|
||||||
|
|
||||||
|
/** Singleton object */
|
||||||
|
object Settings {
|
||||||
|
val version: String = "1.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Class with documented members */
|
||||||
|
class Client {
|
||||||
|
/** Returns a greeting. */
|
||||||
|
fun greet(name: String): String = "hi " + name
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
See a runnable sample file in `docs/samples/definitions.lyng.d`.
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- Use real bodies if the declaration is not `extern` or `abstract`.
|
||||||
|
- If you need purely declarative stubs, prefer `extern` members (see `embedding.md`).
|
||||||
|
|
||||||
|
## Doc Comment Format
|
||||||
|
|
||||||
|
Doc comments are picked up when they immediately precede a declaration.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
/**
|
||||||
|
* A sample function.
|
||||||
|
* @param name user name
|
||||||
|
* @return greeting string
|
||||||
|
*/
|
||||||
|
fun greet(name: String): String = "hi " + name
|
||||||
|
```
|
||||||
|
|
||||||
|
## Generating `.lyng.d` Files
|
||||||
|
|
||||||
|
You can generate `.lyng.d` as part of your build. A common approach is to write a Gradle task that emits a file from a
|
||||||
|
template or a Kotlin data model.
|
||||||
|
|
||||||
|
Example (pseudo-code):
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
tasks.register("generateLyngDefs") {
|
||||||
|
doLast {
|
||||||
|
val out = file("src/main/lyng/api.lyng.d")
|
||||||
|
out.writeText(
|
||||||
|
"""
|
||||||
|
/** Generated API */
|
||||||
|
fun ping(): Int
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Place the generated file in your source tree, and the IDE will load it automatically.
|
||||||
+17
-9
@@ -6,12 +6,13 @@
|
|||||||
|
|
||||||
1. **Security:** I/O and process execution are sensitive operations. By keeping them in a separate module, we ensure that the Lyng core remains 100% safe by default. You only enable what you explicitly need.
|
1. **Security:** I/O and process execution are sensitive operations. By keeping them in a separate module, we ensure that the Lyng core remains 100% safe by default. You only enable what you explicitly need.
|
||||||
2. **Footprint:** Not every script needs filesystem or process access. Keeping these as a separate module helps minimize the dependency footprint for small embedded projects.
|
2. **Footprint:** Not every script needs filesystem or process access. Keeping these as a separate module helps minimize the dependency footprint for small embedded projects.
|
||||||
3. **Control:** `lyngio` provides fine-grained security policies (`FsAccessPolicy`, `ProcessAccessPolicy`) that allow you to control exactly what a script can do.
|
3. **Control:** `lyngio` provides fine-grained security policies (`FsAccessPolicy`, `ProcessAccessPolicy`, `ConsoleAccessPolicy`) that allow you to control exactly what a script can do.
|
||||||
|
|
||||||
#### Included Modules
|
#### Included Modules
|
||||||
|
|
||||||
- **[lyng.io.fs](lyng.io.fs.md):** Async filesystem access. Provides the `Path` class for file/directory operations, streaming, and globbing.
|
- **[lyng.io.fs](lyng.io.fs.md):** Async filesystem access. Provides the `Path` class for file/directory operations, streaming, and globbing.
|
||||||
- **[lyng.io.process](lyng.io.process.md):** External process execution and shell commands. Provides `Process`, `RunningProcess`, and `Platform` information.
|
- **[lyng.io.process](lyng.io.process.md):** External process execution and shell commands. Provides `Process`, `RunningProcess`, and `Platform` information.
|
||||||
|
- **[lyng.io.console](lyng.io.console.md):** Rich console/TTY access. Provides `Console` capability detection, geometry, output, and iterable events.
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
@@ -39,8 +40,10 @@ To use `lyngio` modules in your scripts, you must install them into your Lyng sc
|
|||||||
import net.sergeych.lyng.Script
|
import net.sergeych.lyng.Script
|
||||||
import net.sergeych.lyng.io.fs.createFs
|
import net.sergeych.lyng.io.fs.createFs
|
||||||
import net.sergeych.lyng.io.process.createProcessModule
|
import net.sergeych.lyng.io.process.createProcessModule
|
||||||
|
import net.sergeych.lyng.io.console.createConsoleModule
|
||||||
import net.sergeych.lyngio.fs.security.PermitAllAccessPolicy
|
import net.sergeych.lyngio.fs.security.PermitAllAccessPolicy
|
||||||
import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
|
import net.sergeych.lyngio.process.security.PermitAllProcessAccessPolicy
|
||||||
|
import net.sergeych.lyngio.console.security.PermitAllConsoleAccessPolicy
|
||||||
|
|
||||||
suspend fun runMyScript() {
|
suspend fun runMyScript() {
|
||||||
val scope = Script.newScope()
|
val scope = Script.newScope()
|
||||||
@@ -48,14 +51,17 @@ suspend fun runMyScript() {
|
|||||||
// Install modules with policies
|
// Install modules with policies
|
||||||
createFs(PermitAllAccessPolicy, scope)
|
createFs(PermitAllAccessPolicy, scope)
|
||||||
createProcessModule(PermitAllProcessAccessPolicy, scope)
|
createProcessModule(PermitAllProcessAccessPolicy, scope)
|
||||||
|
createConsoleModule(PermitAllConsoleAccessPolicy, scope)
|
||||||
|
|
||||||
// Now scripts can import them
|
// Now scripts can import them
|
||||||
scope.eval("""
|
scope.eval("""
|
||||||
import lyng.io.fs
|
import lyng.io.fs
|
||||||
import lyng.io.process
|
import lyng.io.process
|
||||||
|
import lyng.io.console
|
||||||
|
|
||||||
println("Working dir: " + Path(".").readUtf8())
|
println("Working dir: " + Path(".").readUtf8())
|
||||||
println("OS: " + Platform.details().name)
|
println("OS: " + Platform.details().name)
|
||||||
|
println("TTY: " + Console.isTty())
|
||||||
""")
|
""")
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
@@ -68,20 +74,22 @@ suspend fun runMyScript() {
|
|||||||
|
|
||||||
- **Filesystem Security:** Implement `FsAccessPolicy` to restrict access to specific paths or operations (e.g., read-only access to a sandbox directory).
|
- **Filesystem Security:** Implement `FsAccessPolicy` to restrict access to specific paths or operations (e.g., read-only access to a sandbox directory).
|
||||||
- **Process Security:** Implement `ProcessAccessPolicy` to restrict which executables can be run or to disable shell execution entirely.
|
- **Process Security:** Implement `ProcessAccessPolicy` to restrict which executables can be run or to disable shell execution entirely.
|
||||||
|
- **Console Security:** Implement `ConsoleAccessPolicy` to control output writes, event reads, and raw mode switching.
|
||||||
|
|
||||||
For more details, see the specific module documentation:
|
For more details, see the specific module documentation:
|
||||||
- [Filesystem Security Details](lyng.io.fs.md#access-policy-security)
|
- [Filesystem Security Details](lyng.io.fs.md#access-policy-security)
|
||||||
- [Process Security Details](lyng.io.process.md#security-policy)
|
- [Process Security Details](lyng.io.process.md#security-policy)
|
||||||
|
- [Console Module Details](lyng.io.console.md)
|
||||||
|
|
||||||
---
|
---
|
||||||
|
|
||||||
#### Platform Support Overview
|
#### Platform Support Overview
|
||||||
|
|
||||||
| Platform | lyng.io.fs | lyng.io.process |
|
| Platform | lyng.io.fs | lyng.io.process | lyng.io.console |
|
||||||
| :--- | :---: | :---: |
|
| :--- | :---: | :---: | :---: |
|
||||||
| **JVM** | ✅ | ✅ |
|
| **JVM** | ✅ | ✅ | ✅ (baseline) |
|
||||||
| **Native (Linux/macOS)** | ✅ | ✅ |
|
| **Native (Linux/macOS)** | ✅ | ✅ | 🚧 |
|
||||||
| **Native (Windows)** | ✅ | 🚧 (Planned) |
|
| **Native (Windows)** | ✅ | 🚧 (Planned) | 🚧 |
|
||||||
| **Android** | ✅ | ❌ |
|
| **Android** | ✅ | ❌ | ❌ |
|
||||||
| **NodeJS** | ✅ | ❌ |
|
| **NodeJS** | ✅ | ❌ | ❌ |
|
||||||
| **Browser / Wasm** | ✅ (In-memory) | ❌ |
|
| **Browser / Wasm** | ✅ (In-memory) | ❌ | ❌ |
|
||||||
@@ -110,6 +110,29 @@ For example:
|
|||||||
assert( 5.clamp(0..10) == 5 )
|
assert( 5.clamp(0..10) == 5 )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
## Random values
|
||||||
|
|
||||||
|
Lyng stdlib provides a global random singleton and deterministic seeded generators:
|
||||||
|
|
||||||
|
| name | meaning |
|
||||||
|
|--------------------------|---------|
|
||||||
|
| Random.nextInt() | random `Int` from full platform range |
|
||||||
|
| Random.nextFloat() | random `Real` in `[0,1)` |
|
||||||
|
| Random.next(range) | random value from the given finite range |
|
||||||
|
| Random.seeded(seed) | creates deterministic generator |
|
||||||
|
| SeededRandom.nextInt() | deterministic random `Int` |
|
||||||
|
| SeededRandom.nextFloat() | deterministic random `Real` in `[0,1)` |
|
||||||
|
| SeededRandom.next(range) | deterministic random value from range |
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
val rng = Random.seeded(1234)
|
||||||
|
assert( rng.next(1..10) in 1..10 )
|
||||||
|
assert( rng.next('a'..<'f') in 'a'..<'f' )
|
||||||
|
assert( rng.next(0.0..<1.0) >= 0.0 )
|
||||||
|
assert( rng.next(0.0..<1.0) < 1.0 )
|
||||||
|
>>> void
|
||||||
|
|
||||||
## Scientific constant
|
## Scientific constant
|
||||||
|
|
||||||
| name | meaning |
|
| name | meaning |
|
||||||
|
|||||||
@@ -0,0 +1,65 @@
|
|||||||
|
/**
|
||||||
|
* Sample .lyng.d file for IDE support.
|
||||||
|
* Demonstrates declarations and doc comments.
|
||||||
|
*/
|
||||||
|
|
||||||
|
/** Simple function with default and named parameters. */
|
||||||
|
extern fun connect(url: String, timeoutMs: Int = 5000): Client
|
||||||
|
|
||||||
|
/** Type alias with generics. */
|
||||||
|
type NameMap = Map<String, String>
|
||||||
|
|
||||||
|
/** Multiple inheritance via interfaces. */
|
||||||
|
interface A { abstract fun a(): Int }
|
||||||
|
interface B { abstract fun b(): Int }
|
||||||
|
|
||||||
|
/** A concrete class implementing both. */
|
||||||
|
class Multi(name: String) : A, B {
|
||||||
|
/** Public field. */
|
||||||
|
val id: Int = 0
|
||||||
|
|
||||||
|
/** Mutable property with accessors. */
|
||||||
|
var size: Int
|
||||||
|
get() = 0
|
||||||
|
set(v) { }
|
||||||
|
|
||||||
|
/** Instance method. */
|
||||||
|
fun a(): Int = 1
|
||||||
|
fun b(): Int = 2
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Nullable and dynamic types. */
|
||||||
|
extern val dynValue: dynamic
|
||||||
|
extern var dynVar: dynamic?
|
||||||
|
|
||||||
|
/** Delegated property provider. */
|
||||||
|
class LazyBox(val create) {
|
||||||
|
fun getValue(thisRef, name) = create()
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Delegated property using provider. */
|
||||||
|
val cached by LazyBox { 42 }
|
||||||
|
|
||||||
|
/** Delegated function. */
|
||||||
|
object RpcDelegate {
|
||||||
|
fun invoke(thisRef, name, args...) = Unset
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Remote function proxy. */
|
||||||
|
fun remoteCall by RpcDelegate
|
||||||
|
|
||||||
|
/** Singleton object. */
|
||||||
|
object Settings {
|
||||||
|
/** Version string. */
|
||||||
|
val version: String = "1.0"
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Client API entry.
|
||||||
|
* @param name user name
|
||||||
|
* @return greeting string
|
||||||
|
*/
|
||||||
|
class Client {
|
||||||
|
/** Returns a greeting. */
|
||||||
|
fun greet(name: String): String = "hi " + name
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
fun describe<T>(x: T): String = when (T) {
|
||||||
|
nullable -> "nullable"
|
||||||
|
else -> "non-null"
|
||||||
|
}
|
||||||
|
|
||||||
|
type MaybeInt = Int?
|
||||||
|
assert(MaybeInt is nullable)
|
||||||
|
assert(!(Int is nullable))
|
||||||
|
assertEquals("nullable", describe<Int?>(null))
|
||||||
|
assertEquals("non-null", describe<Int>(1))
|
||||||
+27
-3
@@ -14,7 +14,7 @@ __Other documents to read__ maybe after this one:
|
|||||||
- [time](time.md) and [parallelism](parallelism.md)
|
- [time](time.md) and [parallelism](parallelism.md)
|
||||||
- [parallelism] - multithreaded code, coroutines, etc.
|
- [parallelism] - multithreaded code, coroutines, etc.
|
||||||
- Some class
|
- Some class
|
||||||
references: [List], [Set], [Map], [Real], [Range], [Iterable], [Iterator], [time manipulation](time.md), [Array], [RingBuffer], [Buffer].
|
references: [List], [ImmutableList], [Set], [ImmutableSet], [Map], [ImmutableMap], [Real], [Range], [Iterable], [Iterator], [time manipulation](time.md), [Array], [RingBuffer], [Buffer].
|
||||||
- Some samples: [combinatorics](samples/combinatorics.lyng.md), national vars and
|
- Some samples: [combinatorics](samples/combinatorics.lyng.md), national vars and
|
||||||
loops: [сумма ряда](samples/сумма_ряда.lyng.md). More at [samples folder](samples)
|
loops: [сумма ряда](samples/сумма_ряда.lyng.md). More at [samples folder](samples)
|
||||||
|
|
||||||
@@ -502,6 +502,18 @@ Aliases expand to their underlying type expressions. See `docs/generics.md` for
|
|||||||
|
|
||||||
`Null` is the class of `null`. It is a singleton type and mostly useful for type inference results.
|
`Null` is the class of `null`. It is a singleton type and mostly useful for type inference results.
|
||||||
|
|
||||||
|
For type expressions, you can check nullability directly:
|
||||||
|
|
||||||
|
T is nullable
|
||||||
|
T !is nullable
|
||||||
|
|
||||||
|
This is especially useful in generic code and in `when` over a type parameter:
|
||||||
|
|
||||||
|
fun describe<T>(x: T): String = when (T) {
|
||||||
|
nullable -> "nullable"
|
||||||
|
else -> "non-null"
|
||||||
|
}
|
||||||
|
|
||||||
## Type inference
|
## Type inference
|
||||||
|
|
||||||
The compiler infers types from:
|
The compiler infers types from:
|
||||||
@@ -785,6 +797,7 @@ Lyng has built-in mutable array class `List` with simple literals:
|
|||||||
|
|
||||||
[List] is an implementation of the type `Array`, and through it `Collection` and [Iterable]. Please read [Iterable],
|
[List] is an implementation of the type `Array`, and through it `Collection` and [Iterable]. Please read [Iterable],
|
||||||
many collection based methods are implemented there.
|
many collection based methods are implemented there.
|
||||||
|
For immutable list values, use `list.toImmutable()` and [ImmutableList].
|
||||||
|
|
||||||
Lists can contain any type of objects, lists too:
|
Lists can contain any type of objects, lists too:
|
||||||
|
|
||||||
@@ -967,6 +980,7 @@ Set are unordered collection of unique elements, see [Set]. Sets are [Iterable]
|
|||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Please see [Set] for detailed description.
|
Please see [Set] for detailed description.
|
||||||
|
For immutable set values, use `set.toImmutable()` and [ImmutableSet].
|
||||||
|
|
||||||
# Maps
|
# Maps
|
||||||
|
|
||||||
@@ -1027,6 +1041,7 @@ Notes:
|
|||||||
- When you need computed (expression) keys or non-string keys, use `Map(...)` constructor with entries, e.g. `Map( ("a" + "b") => 1 )`, then merge with a literal if needed: `{ base: } + (computedKey => 42)`.
|
- When you need computed (expression) keys or non-string keys, use `Map(...)` constructor with entries, e.g. `Map( ("a" + "b") => 1 )`, then merge with a literal if needed: `{ base: } + (computedKey => 42)`.
|
||||||
|
|
||||||
Please see the [Map] reference for a deeper guide.
|
Please see the [Map] reference for a deeper guide.
|
||||||
|
For immutable map values, use `map.toImmutable()` and [ImmutableMap].
|
||||||
|
|
||||||
# Flow control operators
|
# Flow control operators
|
||||||
|
|
||||||
@@ -1540,18 +1555,21 @@ The type for the character objects is `Char`.
|
|||||||
| \t | 0x07, tabulation |
|
| \t | 0x07, tabulation |
|
||||||
| \\ | \ slash character |
|
| \\ | \ slash character |
|
||||||
| \" | " double quote |
|
| \" | " double quote |
|
||||||
|
| \uXXXX | unicode code point |
|
||||||
|
|
||||||
|
Unicode escape form is exactly 4 hex digits, e.g. `"\u263A"` -> `☺`.
|
||||||
|
|
||||||
Other `\c` combinations, where c is any char except mentioned above, are left intact, e.g.:
|
Other `\c` combinations, where c is any char except mentioned above, are left intact, e.g.:
|
||||||
|
|
||||||
val s = "\a"
|
val s = "\a"
|
||||||
assert(s[0] == '\')
|
assert(s[0] == '\\')
|
||||||
assert(s[1] == 'a')
|
assert(s[1] == 'a')
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
same as:
|
same as:
|
||||||
|
|
||||||
val s = "\\a"
|
val s = "\\a"
|
||||||
assert(s[0] == '\')
|
assert(s[0] == '\\')
|
||||||
assert(s[1] == 'a')
|
assert(s[1] == 'a')
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
@@ -1566,6 +1584,9 @@ Are the same as in string literals with little difference:
|
|||||||
| \t | 0x07, tabulation |
|
| \t | 0x07, tabulation |
|
||||||
| \\ | \ slash character |
|
| \\ | \ slash character |
|
||||||
| \' | ' apostrophe |
|
| \' | ' apostrophe |
|
||||||
|
| \uXXXX | unicode code point |
|
||||||
|
|
||||||
|
For char literals, use `'\\'` to represent a single backslash character; `'\'` is invalid.
|
||||||
|
|
||||||
### Char instance members
|
### Char instance members
|
||||||
|
|
||||||
@@ -1750,6 +1771,7 @@ Lambda avoid unnecessary execution if assertion is not failed. for example:
|
|||||||
| π | See [math](math.md) |
|
| π | See [math](math.md) |
|
||||||
|
|
||||||
[List]: List.md
|
[List]: List.md
|
||||||
|
[ImmutableList]: ImmutableList.md
|
||||||
|
|
||||||
[Testing]: Testing.md
|
[Testing]: Testing.md
|
||||||
|
|
||||||
@@ -1766,8 +1788,10 @@ Lambda avoid unnecessary execution if assertion is not failed. for example:
|
|||||||
[string formatting]: https://github.com/sergeych/mp_stools?tab=readme-ov-file#sprintf-syntax-summary
|
[string formatting]: https://github.com/sergeych/mp_stools?tab=readme-ov-file#sprintf-syntax-summary
|
||||||
|
|
||||||
[Set]: Set.md
|
[Set]: Set.md
|
||||||
|
[ImmutableSet]: ImmutableSet.md
|
||||||
|
|
||||||
[Map]: Map.md
|
[Map]: Map.md
|
||||||
|
[ImmutableMap]: ImmutableMap.md
|
||||||
|
|
||||||
[Buffer]: Buffer.md
|
[Buffer]: Buffer.md
|
||||||
|
|
||||||
|
|||||||
+2
-1
@@ -248,6 +248,7 @@ The `Obj.getLyngExceptionMessageWithStackTrace()` extension method has been adde
|
|||||||
Lyng now provides a public Kotlin reflection bridge and a Lyng‑first class binding workflow. This is the **preferred** way to write Kotlin extensions and library integrations:
|
Lyng now provides a public Kotlin reflection bridge and a Lyng‑first class binding workflow. This is the **preferred** way to write Kotlin extensions and library integrations:
|
||||||
|
|
||||||
- **Bridge resolver**: explicit handles for values, vars, and callables with predictable lookup rules.
|
- **Bridge resolver**: explicit handles for values, vars, and callables with predictable lookup rules.
|
||||||
- **Class bridge binding**: declare classes/members in Lyng (marked `extern`) and bind the implementations in Kotlin before the first instance is created.
|
- **Class bridge binding**: declare extern surfaces in Lyng (`extern` members, or members inside `extern class/object`) and bind the implementations in Kotlin before the first instance is created.
|
||||||
|
- **Extern declaration rule**: `extern class` / `extern object` are declaration-only; all members in their bodies are implicitly extern.
|
||||||
|
|
||||||
See **Embedding Lyng** for full samples and usage details.
|
See **Embedding Lyng** for full samples and usage details.
|
||||||
@@ -18,6 +18,11 @@ In particular, it means no slow and flaky runtime lookups. Once compiled, code g
|
|||||||
|
|
||||||
The API is fixed and will be kept with further Lyng core changes. It is now the recommended way to write Lyng extensions in Kotlin. It is much simpler and more elegant than the internal one. See [Kotlin Bridge Binding](../notes/kotlin_bridge_binding.md).
|
The API is fixed and will be kept with further Lyng core changes. It is now the recommended way to write Lyng extensions in Kotlin. It is much simpler and more elegant than the internal one. See [Kotlin Bridge Binding](../notes/kotlin_bridge_binding.md).
|
||||||
|
|
||||||
|
Extern declaration clarification:
|
||||||
|
- `extern class` / `extern object` are pure extern surfaces.
|
||||||
|
- Members inside them are implicitly extern (`extern` on a member is optional/redundant).
|
||||||
|
- Lyng method/property bodies for these declarations should be implemented as extensions instead.
|
||||||
|
|
||||||
### Smart types system
|
### Smart types system
|
||||||
|
|
||||||
- **Deep inference**: The compiler analyzes types of symbols along the execution path and in many cases eliminates unnecessary casts or type specifications.
|
- **Deep inference**: The compiler analyzes types of symbols along the execution path and in many cases eliminates unnecessary casts or type specifications.
|
||||||
|
|||||||
@@ -0,0 +1,659 @@
|
|||||||
|
#!/usr/bin/env lyng
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Lyng Console Tetris (interactive sample)
|
||||||
|
*
|
||||||
|
* Controls:
|
||||||
|
* - Left/Right arrows or A/D: move
|
||||||
|
* - Up arrow or W: rotate
|
||||||
|
* - Down arrow or S: soft drop
|
||||||
|
* - Space: hard drop
|
||||||
|
* - Q or Escape: quit
|
||||||
|
*/
|
||||||
|
|
||||||
|
import lyng.io.console
|
||||||
|
|
||||||
|
val MIN_COLS = 56
|
||||||
|
val MIN_ROWS = 24
|
||||||
|
val PANEL_WIDTH = 24
|
||||||
|
val BOARD_MARGIN_ROWS = 8
|
||||||
|
val BOARD_MIN_W = 10
|
||||||
|
val BOARD_MAX_W = 16
|
||||||
|
val BOARD_MIN_H = 16
|
||||||
|
val BOARD_MAX_H = 28
|
||||||
|
val LEVEL_LINES_STEP = 10
|
||||||
|
val DROP_FRAMES_BASE = 15
|
||||||
|
val DROP_FRAMES_MIN = 3
|
||||||
|
val FRAME_DELAY_MS = 35
|
||||||
|
val RESIZE_WAIT_MS = 250
|
||||||
|
val ROTATION_KICKS = [0, -1, 1, -2, 2]
|
||||||
|
val ANSI_ESC = "\u001b["
|
||||||
|
val ANSI_RESET = ANSI_ESC + "0m"
|
||||||
|
val UNICODE_BLOCK = "██"
|
||||||
|
val UNICODE_TOP_LEFT = "┌"
|
||||||
|
val UNICODE_TOP_RIGHT = "┐"
|
||||||
|
val UNICODE_BOTTOM_LEFT = "└"
|
||||||
|
val UNICODE_BOTTOM_RIGHT = "┘"
|
||||||
|
val UNICODE_HORIZONTAL = "──"
|
||||||
|
val UNICODE_VERTICAL = "│"
|
||||||
|
val UNICODE_DOT = "· "
|
||||||
|
|
||||||
|
type Cell = List<Int>
|
||||||
|
type Rotation = List<Cell>
|
||||||
|
type Rotations = List<Rotation>
|
||||||
|
type Row = List<Int>
|
||||||
|
type Board = List<Row>
|
||||||
|
|
||||||
|
class Piece(val name: String, val rotations: Rotations) {}
|
||||||
|
class RotateResult(val ok: Bool, val rot: Int, val px: Int) {}
|
||||||
|
class GameState(
|
||||||
|
pieceId0: Int,
|
||||||
|
nextId0: Int,
|
||||||
|
next2Id0: Int,
|
||||||
|
px0: Int,
|
||||||
|
py0: Int,
|
||||||
|
) {
|
||||||
|
var pieceId = pieceId0
|
||||||
|
var nextId = nextId0
|
||||||
|
var next2Id = next2Id0
|
||||||
|
var rot = 0
|
||||||
|
var px = px0
|
||||||
|
var py = py0
|
||||||
|
var score = 0
|
||||||
|
var totalLines = 0
|
||||||
|
var level = 1
|
||||||
|
var running = true
|
||||||
|
var gameOver = false
|
||||||
|
}
|
||||||
|
class LoopFrame(val resized: Bool, val originRow: Int, val originCol: Int) {}
|
||||||
|
|
||||||
|
fun clearAndHome() {
|
||||||
|
Console.clear()
|
||||||
|
Console.home()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun repeatText(s: String, n: Int): String {
|
||||||
|
var out: String = ""
|
||||||
|
var i = 0
|
||||||
|
while (i < n) {
|
||||||
|
out += s
|
||||||
|
i = i + 1
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
fun maxInt(a: Int, b: Int): Int {
|
||||||
|
if (a > b) a else b
|
||||||
|
}
|
||||||
|
|
||||||
|
fun minInt(a: Int, b: Int): Int {
|
||||||
|
if (a < b) a else b
|
||||||
|
}
|
||||||
|
|
||||||
|
fun clampInt(v: Int, lo: Int, hi: Int): Int {
|
||||||
|
minInt(hi, maxInt(lo, v))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun emptyRow(width: Int): Row {
|
||||||
|
val r: Row = []
|
||||||
|
var x = 0
|
||||||
|
while (x < width) {
|
||||||
|
r.add(0)
|
||||||
|
x = x + 1
|
||||||
|
}
|
||||||
|
r
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createBoard(width: Int, height: Int): Board {
|
||||||
|
val b: Board = []
|
||||||
|
var y = 0
|
||||||
|
while (y < height) {
|
||||||
|
b.add(emptyRow(width))
|
||||||
|
y = y + 1
|
||||||
|
}
|
||||||
|
b
|
||||||
|
}
|
||||||
|
|
||||||
|
fun colorize(text: String, sgr: String, useColor: Bool): String {
|
||||||
|
if (!useColor) return text
|
||||||
|
ANSI_ESC + sgr + "m" + text + ANSI_RESET
|
||||||
|
}
|
||||||
|
|
||||||
|
fun blockText(pieceId: Int, useColor: Bool): String {
|
||||||
|
if (pieceId <= 0) return " "
|
||||||
|
val sgr = when (pieceId) {
|
||||||
|
1 -> "36" // I
|
||||||
|
2 -> "33" // O
|
||||||
|
3 -> "35" // T
|
||||||
|
4 -> "32" // S
|
||||||
|
5 -> "31" // Z
|
||||||
|
6 -> "34" // J
|
||||||
|
7 -> "93" // L
|
||||||
|
else -> "37"
|
||||||
|
}
|
||||||
|
colorize(UNICODE_BLOCK, sgr, useColor)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun emptyCellText(useColor: Bool): String {
|
||||||
|
colorize(UNICODE_DOT, "90", useColor)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun canPlace(board: Board, boardW: Int, boardH: Int, pieceId: Int, rot: Int, px: Int, py: Int): Bool {
|
||||||
|
val piece: Piece = PIECES[pieceId - 1]
|
||||||
|
val cells = piece.rotations[rot]
|
||||||
|
|
||||||
|
for (cell in cells) {
|
||||||
|
val x = px + cell[0]
|
||||||
|
val y = py + cell[1]
|
||||||
|
|
||||||
|
if (x < 0 || x >= boardW) return false
|
||||||
|
if (y >= boardH) return false
|
||||||
|
|
||||||
|
if (y >= 0) {
|
||||||
|
val row = board[y]
|
||||||
|
if (row[x] != 0) return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun lockPiece(board: Board, pieceId: Int, rot: Int, px: Int, py: Int): Void {
|
||||||
|
val piece: Piece = PIECES[pieceId - 1]
|
||||||
|
val cells = piece.rotations[rot]
|
||||||
|
|
||||||
|
for (cell in cells) {
|
||||||
|
val x = px + cell[0]
|
||||||
|
val y = py + cell[1]
|
||||||
|
|
||||||
|
if (y >= 0) {
|
||||||
|
val row = board[y]
|
||||||
|
row[x] = pieceId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun clearCompletedLines(board: Board, boardW: Int, boardH: Int): Int {
|
||||||
|
val b = board
|
||||||
|
var y = boardH - 1
|
||||||
|
var cleared = 0
|
||||||
|
|
||||||
|
while (y >= 0) {
|
||||||
|
val row = b[y]
|
||||||
|
var full = true
|
||||||
|
var x = 0
|
||||||
|
while (x < boardW) {
|
||||||
|
if (row[x] == 0) {
|
||||||
|
full = false
|
||||||
|
break
|
||||||
|
}
|
||||||
|
x = x + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
if (full) {
|
||||||
|
b.removeAt(y)
|
||||||
|
b.insertAt(0, emptyRow(boardW))
|
||||||
|
cleared = cleared + 1
|
||||||
|
} else {
|
||||||
|
y = y - 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
cleared
|
||||||
|
}
|
||||||
|
|
||||||
|
fun activeCellId(pieceId: Int, rot: Int, px: Int, py: Int, x: Int, y: Int): Int {
|
||||||
|
val piece: Piece = PIECES[pieceId - 1]
|
||||||
|
val cells = piece.rotations[rot]
|
||||||
|
|
||||||
|
for (cell in cells) {
|
||||||
|
val ax = px + cell[0]
|
||||||
|
val ay = py + cell[1]
|
||||||
|
if (ax == x && ay == y) return pieceId
|
||||||
|
}
|
||||||
|
|
||||||
|
0
|
||||||
|
}
|
||||||
|
|
||||||
|
fun tryRotateCw(board: Board, boardW: Int, boardH: Int, pieceId: Int, rot: Int, px: Int, py: Int): RotateResult {
|
||||||
|
val piece: Piece = PIECES[pieceId - 1]
|
||||||
|
val rotations = piece.rotations.size
|
||||||
|
val nr = (rot + 1) % rotations
|
||||||
|
for (kx in ROTATION_KICKS) {
|
||||||
|
val nx = px + kx
|
||||||
|
if (canPlace(board, boardW, boardH, pieceId, nr, nx, py)) {
|
||||||
|
return RotateResult(true, nr, nx)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
RotateResult(false, rot, px)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun nextPreviewLines(pieceId: Int, useColor: Bool): List<String> {
|
||||||
|
val out: List<String> = []
|
||||||
|
if (pieceId <= 0) {
|
||||||
|
out.add(" ")
|
||||||
|
out.add(" ")
|
||||||
|
out.add(" ")
|
||||||
|
out.add(" ")
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
val piece: Piece = PIECES[pieceId - 1]
|
||||||
|
val cells = piece.rotations[0]
|
||||||
|
|
||||||
|
var y = 0
|
||||||
|
while (y < 4) {
|
||||||
|
var line = ""
|
||||||
|
var x = 0
|
||||||
|
while (x < 4) {
|
||||||
|
var filled = false
|
||||||
|
for (cell in cells) {
|
||||||
|
if (cell[0] == x && cell[1] == y) {
|
||||||
|
filled = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
line += if (filled) blockText(pieceId, useColor) else " "
|
||||||
|
x = x + 1
|
||||||
|
}
|
||||||
|
out.add(line)
|
||||||
|
y = y + 1
|
||||||
|
}
|
||||||
|
out
|
||||||
|
}
|
||||||
|
|
||||||
|
fun render(
|
||||||
|
state: GameState,
|
||||||
|
board: Board,
|
||||||
|
boardW: Int,
|
||||||
|
boardH: Int,
|
||||||
|
prevFrameLines: List<String>,
|
||||||
|
originRow: Int,
|
||||||
|
originCol: Int,
|
||||||
|
useColor: Bool,
|
||||||
|
): List<String> {
|
||||||
|
val bottomBorder = UNICODE_BOTTOM_LEFT + repeatText(UNICODE_HORIZONTAL, boardW) + UNICODE_BOTTOM_RIGHT
|
||||||
|
|
||||||
|
val panel: List<String> = []
|
||||||
|
val nextPiece: Piece = PIECES[state.nextId - 1]
|
||||||
|
val next2Piece: Piece = PIECES[state.next2Id - 1]
|
||||||
|
val nextName = nextPiece.name
|
||||||
|
val next2Name = next2Piece.name
|
||||||
|
val preview = nextPreviewLines(state.nextId, useColor)
|
||||||
|
|
||||||
|
panel.add("Lyng Tetris")
|
||||||
|
panel.add("")
|
||||||
|
panel.add("Score: " + state.score)
|
||||||
|
panel.add("Lines: " + state.totalLines)
|
||||||
|
panel.add("Level: " + state.level)
|
||||||
|
panel.add("")
|
||||||
|
panel.add("Next: " + nextName)
|
||||||
|
panel.add("")
|
||||||
|
for (pl in preview) panel.add(pl)
|
||||||
|
panel.add("After: " + next2Name)
|
||||||
|
panel.add("")
|
||||||
|
panel.add("Keys:")
|
||||||
|
panel.add("A/D or arrows")
|
||||||
|
panel.add("W/Up: rotate")
|
||||||
|
panel.add("S/Down: drop")
|
||||||
|
panel.add("Space: hard drop")
|
||||||
|
panel.add("Q/Esc: quit")
|
||||||
|
|
||||||
|
val frameLines: List<String> = []
|
||||||
|
|
||||||
|
var y = 0
|
||||||
|
while (y < boardH) {
|
||||||
|
var line = UNICODE_VERTICAL
|
||||||
|
|
||||||
|
var x = 0
|
||||||
|
while (x < boardW) {
|
||||||
|
val a = activeCellId(state.pieceId, state.rot, state.px, state.py, x, y)
|
||||||
|
val row = board[y]
|
||||||
|
val b = row[x]
|
||||||
|
val id = if (a > 0) a else b
|
||||||
|
line += if (id > 0) blockText(id, useColor) else emptyCellText(useColor)
|
||||||
|
x = x + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
line += UNICODE_VERTICAL
|
||||||
|
|
||||||
|
val p = y
|
||||||
|
if (p < panel.size) {
|
||||||
|
line += " " + panel[p]
|
||||||
|
}
|
||||||
|
|
||||||
|
frameLines.add(line)
|
||||||
|
y = y + 1
|
||||||
|
}
|
||||||
|
|
||||||
|
frameLines.add(bottomBorder)
|
||||||
|
|
||||||
|
val prev = prevFrameLines
|
||||||
|
var i = 0
|
||||||
|
while (i < frameLines.size) {
|
||||||
|
val line = frameLines[i]
|
||||||
|
val old = if (i < prev.size) prev[i] else null
|
||||||
|
if (old != line) {
|
||||||
|
Console.moveTo(originRow + i, originCol)
|
||||||
|
Console.clearLine()
|
||||||
|
Console.write(line)
|
||||||
|
}
|
||||||
|
i = i + 1
|
||||||
|
}
|
||||||
|
frameLines
|
||||||
|
}
|
||||||
|
|
||||||
|
fun waitForMinimumSize(minCols: Int, minRows: Int): Object {
|
||||||
|
while (true) {
|
||||||
|
val g = Console.geometry()
|
||||||
|
val cols = g?.columns ?: 0
|
||||||
|
val rows = g?.rows ?: 0
|
||||||
|
|
||||||
|
if (cols >= minCols && rows >= minRows) return g
|
||||||
|
|
||||||
|
clearAndHome()
|
||||||
|
println("Lyng Tetris needs at least %sx%s terminal size."(minCols, minRows))
|
||||||
|
println("Current: %sx%s"(cols, rows))
|
||||||
|
println("Resize the console window to continue...")
|
||||||
|
delay(RESIZE_WAIT_MS)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun scoreForLines(cleared: Int, level: Int): Int {
|
||||||
|
when (cleared) {
|
||||||
|
1 -> 100 * level
|
||||||
|
2 -> 300 * level
|
||||||
|
3 -> 500 * level
|
||||||
|
4 -> 800 * level
|
||||||
|
else -> 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Classic 7 tetrominoes, minimal rotations per piece.
|
||||||
|
fun cell(x: Int, y: Int): Cell { [x, y] }
|
||||||
|
fun rot(a: Cell, b: Cell, c: Cell, d: Cell): Rotation {
|
||||||
|
val r: Rotation = []
|
||||||
|
r.add(a)
|
||||||
|
r.add(b)
|
||||||
|
r.add(c)
|
||||||
|
r.add(d)
|
||||||
|
r
|
||||||
|
}
|
||||||
|
|
||||||
|
val PIECES: List<Piece> = []
|
||||||
|
|
||||||
|
val iRots: Rotations = []
|
||||||
|
iRots.add(rot(cell(0,1), cell(1,1), cell(2,1), cell(3,1)))
|
||||||
|
iRots.add(rot(cell(2,0), cell(2,1), cell(2,2), cell(2,3)))
|
||||||
|
PIECES.add(Piece("I", iRots))
|
||||||
|
|
||||||
|
val oRots: Rotations = []
|
||||||
|
oRots.add(rot(cell(1,0), cell(2,0), cell(1,1), cell(2,1)))
|
||||||
|
PIECES.add(Piece("O", oRots))
|
||||||
|
|
||||||
|
val tRots: Rotations = []
|
||||||
|
tRots.add(rot(cell(1,0), cell(0,1), cell(1,1), cell(2,1)))
|
||||||
|
tRots.add(rot(cell(1,0), cell(1,1), cell(2,1), cell(1,2)))
|
||||||
|
tRots.add(rot(cell(0,1), cell(1,1), cell(2,1), cell(1,2)))
|
||||||
|
tRots.add(rot(cell(1,0), cell(0,1), cell(1,1), cell(1,2)))
|
||||||
|
PIECES.add(Piece("T", tRots))
|
||||||
|
|
||||||
|
val sRots: Rotations = []
|
||||||
|
sRots.add(rot(cell(1,0), cell(2,0), cell(0,1), cell(1,1)))
|
||||||
|
sRots.add(rot(cell(1,0), cell(1,1), cell(2,1), cell(2,2)))
|
||||||
|
PIECES.add(Piece("S", sRots))
|
||||||
|
|
||||||
|
val zRots: Rotations = []
|
||||||
|
zRots.add(rot(cell(0,0), cell(1,0), cell(1,1), cell(2,1)))
|
||||||
|
zRots.add(rot(cell(2,0), cell(1,1), cell(2,1), cell(1,2)))
|
||||||
|
PIECES.add(Piece("Z", zRots))
|
||||||
|
|
||||||
|
val jRots: Rotations = []
|
||||||
|
jRots.add(rot(cell(0,0), cell(0,1), cell(1,1), cell(2,1)))
|
||||||
|
jRots.add(rot(cell(1,0), cell(2,0), cell(1,1), cell(1,2)))
|
||||||
|
jRots.add(rot(cell(0,1), cell(1,1), cell(2,1), cell(2,2)))
|
||||||
|
jRots.add(rot(cell(1,0), cell(1,1), cell(0,2), cell(1,2)))
|
||||||
|
PIECES.add(Piece("J", jRots))
|
||||||
|
|
||||||
|
val lRots: Rotations = []
|
||||||
|
lRots.add(rot(cell(2,0), cell(0,1), cell(1,1), cell(2,1)))
|
||||||
|
lRots.add(rot(cell(1,0), cell(1,1), cell(1,2), cell(2,2)))
|
||||||
|
lRots.add(rot(cell(0,1), cell(1,1), cell(2,1), cell(0,2)))
|
||||||
|
lRots.add(rot(cell(0,0), cell(1,0), cell(1,1), cell(1,2)))
|
||||||
|
PIECES.add(Piece("L", lRots))
|
||||||
|
|
||||||
|
if (!Console.isSupported()) {
|
||||||
|
println("Console API is not supported in this runtime.")
|
||||||
|
void
|
||||||
|
} else if (!Console.isTty()) {
|
||||||
|
println("This sample needs an interactive terminal (TTY).")
|
||||||
|
void
|
||||||
|
} else {
|
||||||
|
waitForMinimumSize(MIN_COLS, MIN_ROWS)
|
||||||
|
|
||||||
|
val g0 = Console.geometry()
|
||||||
|
val cols = g0?.columns ?: MIN_COLS
|
||||||
|
val rows = g0?.rows ?: MIN_ROWS
|
||||||
|
|
||||||
|
val boardW = clampInt((cols - PANEL_WIDTH) / 2, BOARD_MIN_W, BOARD_MAX_W)
|
||||||
|
val boardH = clampInt(rows - BOARD_MARGIN_ROWS, BOARD_MIN_H, BOARD_MAX_H)
|
||||||
|
|
||||||
|
val board: Board = createBoard(boardW, boardH)
|
||||||
|
|
||||||
|
fun nextPieceId() {
|
||||||
|
Random.next(1..7)
|
||||||
|
}
|
||||||
|
|
||||||
|
val state: GameState = GameState(
|
||||||
|
nextPieceId(),
|
||||||
|
nextPieceId(),
|
||||||
|
nextPieceId(),
|
||||||
|
(boardW / 2) - 2,
|
||||||
|
-1,
|
||||||
|
)
|
||||||
|
var prevFrameLines: List<String> = []
|
||||||
|
|
||||||
|
val gameMutex = Mutex()
|
||||||
|
var hasResizeEvent = false
|
||||||
|
|
||||||
|
val rawModeEnabled = Console.setRawMode(true)
|
||||||
|
if (!rawModeEnabled) {
|
||||||
|
println("Raw keyboard mode is not available in this terminal/runtime.")
|
||||||
|
println("Use jlyng in an interactive terminal with raw input support.")
|
||||||
|
void
|
||||||
|
} else {
|
||||||
|
val useColor = Console.ansiLevel() != "NONE"
|
||||||
|
Console.enterAltScreen()
|
||||||
|
Console.setCursorVisible(false)
|
||||||
|
clearAndHome()
|
||||||
|
|
||||||
|
fun applyKeyInput(s: GameState, key: String): Void {
|
||||||
|
if (key == "__CTRL_C__" || key == "q" || key == "Q" || key == "Escape") {
|
||||||
|
s.running = false
|
||||||
|
}
|
||||||
|
else if (key == "ArrowLeft" || key == "a" || key == "A") {
|
||||||
|
if (canPlace(board, boardW, boardH, s.pieceId, s.rot, s.px - 1, s.py)) s.px = s.px - 1
|
||||||
|
}
|
||||||
|
else if (key == "ArrowRight" || key == "d" || key == "D") {
|
||||||
|
if (canPlace(board, boardW, boardH, s.pieceId, s.rot, s.px + 1, s.py)) s.px = s.px + 1
|
||||||
|
}
|
||||||
|
else if (key == "ArrowUp" || key == "w" || key == "W") {
|
||||||
|
val rr: RotateResult = tryRotateCw(board, boardW, boardH, s.pieceId, s.rot, s.px, s.py)
|
||||||
|
if (rr.ok) {
|
||||||
|
s.rot = rr.rot
|
||||||
|
s.px = rr.px
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (key == "ArrowDown" || key == "s" || key == "S") {
|
||||||
|
if (canPlace(board, boardW, boardH, s.pieceId, s.rot, s.px, s.py + 1)) {
|
||||||
|
s.py = s.py + 1
|
||||||
|
s.score = s.score + 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else if (key == " ") {
|
||||||
|
while (canPlace(board, boardW, boardH, s.pieceId, s.rot, s.px, s.py + 1)) {
|
||||||
|
s.py = s.py + 1
|
||||||
|
s.score = s.score + 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
var inputRunning = true
|
||||||
|
launch {
|
||||||
|
while (inputRunning) {
|
||||||
|
try {
|
||||||
|
for (ev in Console.events()) {
|
||||||
|
if (!inputRunning) break
|
||||||
|
if (ev is ConsoleKeyEvent) {
|
||||||
|
val ke = ev as ConsoleKeyEvent
|
||||||
|
if (ke.type == "keydown") {
|
||||||
|
val key = ke.key
|
||||||
|
val ctrl = ke.ctrl
|
||||||
|
gameMutex.withLock {
|
||||||
|
val mapped = if (ctrl && (key == "c" || key == "C")) "__CTRL_C__" else key
|
||||||
|
applyKeyInput(state, mapped)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else if (ev is ConsoleResizeEvent) {
|
||||||
|
gameMutex.withLock {
|
||||||
|
hasResizeEvent = true
|
||||||
|
prevFrameLines = []
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (err: Exception) {
|
||||||
|
// Keep game alive: transient console-event failures should not force quit.
|
||||||
|
if (!inputRunning) break
|
||||||
|
Console.setRawMode(true)
|
||||||
|
delay(50)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun pollLoopFrame(): LoopFrame? {
|
||||||
|
val g = Console.geometry()
|
||||||
|
val c = g?.columns ?: 0
|
||||||
|
val r = g?.rows ?: 0
|
||||||
|
if (c < MIN_COLS || r < MIN_ROWS) {
|
||||||
|
waitForMinimumSize(MIN_COLS, MIN_ROWS)
|
||||||
|
clearAndHome()
|
||||||
|
prevFrameLines = []
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
var resized = false
|
||||||
|
gameMutex.withLock {
|
||||||
|
resized = hasResizeEvent
|
||||||
|
hasResizeEvent = false
|
||||||
|
}
|
||||||
|
|
||||||
|
val contentCols = boardW * 2 + 2 + 3 + PANEL_WIDTH
|
||||||
|
val contentRows = boardH + 1
|
||||||
|
val requiredCols = maxInt(MIN_COLS, contentCols)
|
||||||
|
val requiredRows = maxInt(MIN_ROWS, contentRows)
|
||||||
|
if (c < requiredCols || r < requiredRows) {
|
||||||
|
waitForMinimumSize(requiredCols, requiredRows)
|
||||||
|
clearAndHome()
|
||||||
|
prevFrameLines = []
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
val originCol = maxInt(1, ((c - contentCols) / 2) + 1)
|
||||||
|
val originRow = maxInt(1, ((r - contentRows) / 2) + 1)
|
||||||
|
LoopFrame(resized, originRow, originCol)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun advanceGravity(s: GameState, frame: Int): Int {
|
||||||
|
s.level = 1 + (s.totalLines / LEVEL_LINES_STEP)
|
||||||
|
val dropEvery = maxInt(DROP_FRAMES_MIN, DROP_FRAMES_BASE - s.level)
|
||||||
|
|
||||||
|
var nextFrame = frame + 1
|
||||||
|
if (nextFrame < dropEvery) return nextFrame
|
||||||
|
nextFrame = 0
|
||||||
|
|
||||||
|
if (canPlace(board, boardW, boardH, s.pieceId, s.rot, s.px, s.py + 1)) {
|
||||||
|
s.py = s.py + 1
|
||||||
|
return nextFrame
|
||||||
|
}
|
||||||
|
|
||||||
|
lockPiece(board, s.pieceId, s.rot, s.px, s.py)
|
||||||
|
|
||||||
|
val cleared = clearCompletedLines(board, boardW, boardH)
|
||||||
|
if (cleared > 0) {
|
||||||
|
s.totalLines = s.totalLines + cleared
|
||||||
|
s.score = s.score + scoreForLines(cleared, s.level)
|
||||||
|
}
|
||||||
|
|
||||||
|
s.pieceId = s.nextId
|
||||||
|
s.nextId = s.next2Id
|
||||||
|
s.next2Id = nextPieceId()
|
||||||
|
s.rot = 0
|
||||||
|
s.px = (boardW / 2) - 2
|
||||||
|
s.py = -1
|
||||||
|
|
||||||
|
if (!canPlace(board, boardW, boardH, s.pieceId, s.rot, s.px, s.py)) {
|
||||||
|
s.gameOver = true
|
||||||
|
}
|
||||||
|
nextFrame
|
||||||
|
}
|
||||||
|
|
||||||
|
try {
|
||||||
|
if (!canPlace(board, boardW, boardH, state.pieceId, state.rot, state.px, state.py)) {
|
||||||
|
state.gameOver = true
|
||||||
|
}
|
||||||
|
|
||||||
|
var frame = 0
|
||||||
|
var shouldStop = false
|
||||||
|
var prevOriginRow = -1
|
||||||
|
var prevOriginCol = -1
|
||||||
|
while (!shouldStop) {
|
||||||
|
val frameData = pollLoopFrame()
|
||||||
|
if (frameData == null) {
|
||||||
|
frame = 0
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
gameMutex.withLock {
|
||||||
|
if (!state.running || state.gameOver) {
|
||||||
|
shouldStop = true
|
||||||
|
} else {
|
||||||
|
val movedOrigin = frameData.originRow != prevOriginRow || frameData.originCol != prevOriginCol
|
||||||
|
if (frameData.resized || movedOrigin) {
|
||||||
|
clearAndHome()
|
||||||
|
prevFrameLines = []
|
||||||
|
}
|
||||||
|
prevOriginRow = frameData.originRow
|
||||||
|
prevOriginCol = frameData.originCol
|
||||||
|
frame = advanceGravity(state, frame)
|
||||||
|
prevFrameLines = render(
|
||||||
|
state,
|
||||||
|
board,
|
||||||
|
boardW,
|
||||||
|
boardH,
|
||||||
|
prevFrameLines,
|
||||||
|
frameData.originRow,
|
||||||
|
frameData.originCol,
|
||||||
|
useColor
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
Console.flush()
|
||||||
|
delay(FRAME_DELAY_MS)
|
||||||
|
}
|
||||||
|
} finally {
|
||||||
|
inputRunning = false
|
||||||
|
Console.setRawMode(false)
|
||||||
|
Console.setCursorVisible(true)
|
||||||
|
Console.leaveAltScreen()
|
||||||
|
Console.flush()
|
||||||
|
}
|
||||||
|
|
||||||
|
if (state.gameOver) {
|
||||||
|
println("Game over.")
|
||||||
|
} else {
|
||||||
|
println("Bye.")
|
||||||
|
}
|
||||||
|
println("Score: %s"(state.score))
|
||||||
|
println("Lines: %s"(state.totalLines))
|
||||||
|
println("Level: %s"(state.level))
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -38,3 +38,5 @@ kotlin.native.cacheKind.linuxX64=none
|
|||||||
android.experimental.lint.migrateToK2=false
|
android.experimental.lint.migrateToK2=false
|
||||||
android.lint.useK2Uast=false
|
android.lint.useK2Uast=false
|
||||||
kotlin.mpp.applyDefaultHierarchyTemplate=true
|
kotlin.mpp.applyDefaultHierarchyTemplate=true
|
||||||
|
|
||||||
|
org.gradle.parallel=true
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
[versions]
|
[versions]
|
||||||
agp = "8.5.2"
|
agp = "8.5.2"
|
||||||
clikt = "5.0.3"
|
clikt = "5.0.3"
|
||||||
|
mordant = "3.0.2"
|
||||||
kotlin = "2.3.0"
|
kotlin = "2.3.0"
|
||||||
android-minSdk = "24"
|
android-minSdk = "24"
|
||||||
android-compileSdk = "34"
|
android-compileSdk = "34"
|
||||||
@@ -14,6 +15,8 @@ compiler = "3.2.0-alpha11"
|
|||||||
[libraries]
|
[libraries]
|
||||||
clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
|
clikt = { module = "com.github.ajalt.clikt:clikt", version.ref = "clikt" }
|
||||||
clikt-markdown = { module = "com.github.ajalt.clikt:clikt-markdown", version.ref = "clikt" }
|
clikt-markdown = { module = "com.github.ajalt.clikt:clikt-markdown", version.ref = "clikt" }
|
||||||
|
mordant-core = { module = "com.github.ajalt.mordant:mordant-core", version.ref = "mordant" }
|
||||||
|
mordant-jvm-jna = { module = "com.github.ajalt.mordant:mordant-jvm-jna", version.ref = "mordant" }
|
||||||
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
||||||
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
|
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
|
||||||
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
||||||
|
|||||||
@@ -35,13 +35,7 @@ import kotlinx.coroutines.CoroutineScope
|
|||||||
import kotlinx.coroutines.Dispatchers
|
import kotlinx.coroutines.Dispatchers
|
||||||
import kotlinx.coroutines.SupervisorJob
|
import kotlinx.coroutines.SupervisorJob
|
||||||
import kotlinx.coroutines.launch
|
import kotlinx.coroutines.launch
|
||||||
import net.sergeych.lyng.ExecutionError
|
|
||||||
import net.sergeych.lyng.Script
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.requireScope
|
|
||||||
import net.sergeych.lyng.idea.LyngIcons
|
import net.sergeych.lyng.idea.LyngIcons
|
||||||
import net.sergeych.lyng.obj.ObjVoid
|
|
||||||
import net.sergeych.lyng.obj.getLyngExceptionMessageWithStackTrace
|
|
||||||
|
|
||||||
class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
||||||
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
|
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
|
||||||
@@ -59,7 +53,9 @@ class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
|||||||
val isLyng = psiFile?.name?.endsWith(".lyng") == true
|
val isLyng = psiFile?.name?.endsWith(".lyng") == true
|
||||||
e.presentation.isEnabledAndVisible = isLyng
|
e.presentation.isEnabledAndVisible = isLyng
|
||||||
if (isLyng) {
|
if (isLyng) {
|
||||||
e.presentation.text = "Run '${psiFile.name}'"
|
e.presentation.isEnabled = false
|
||||||
|
e.presentation.text = "Run '${psiFile.name}' (disabled)"
|
||||||
|
e.presentation.description = "Running scripts from the IDE is disabled; use the CLI."
|
||||||
} else {
|
} else {
|
||||||
e.presentation.text = "Run Lyng Script"
|
e.presentation.text = "Run Lyng Script"
|
||||||
}
|
}
|
||||||
@@ -68,7 +64,6 @@ class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
|||||||
override fun actionPerformed(e: AnActionEvent) {
|
override fun actionPerformed(e: AnActionEvent) {
|
||||||
val project = e.project ?: return
|
val project = e.project ?: return
|
||||||
val psiFile = getPsiFile(e) ?: return
|
val psiFile = getPsiFile(e) ?: return
|
||||||
val text = psiFile.text
|
|
||||||
val fileName = psiFile.name
|
val fileName = psiFile.name
|
||||||
|
|
||||||
val (console, toolWindow) = getConsoleAndToolWindow(project)
|
val (console, toolWindow) = getConsoleAndToolWindow(project)
|
||||||
@@ -76,40 +71,9 @@ class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
|||||||
|
|
||||||
toolWindow.show {
|
toolWindow.show {
|
||||||
scope.launch {
|
scope.launch {
|
||||||
try {
|
console.print("--- Run is disabled ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
val lyngScope = Script.newScope()
|
console.print("Lyng now runs in bytecode-only mode; the IDE no longer evaluates scripts.\n", ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
lyngScope.addFn("print") {
|
console.print("Use the CLI to run scripts, e.g. `lyng run $fileName`.\n", ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
val sb = StringBuilder()
|
|
||||||
for ((i, arg) in args.list.withIndex()) {
|
|
||||||
if (i > 0) sb.append(" ")
|
|
||||||
sb.append(arg.toString(requireScope()).value)
|
|
||||||
}
|
|
||||||
console.print(sb.toString(), ConsoleViewContentType.NORMAL_OUTPUT)
|
|
||||||
ObjVoid
|
|
||||||
}
|
|
||||||
lyngScope.addFn("println") {
|
|
||||||
val sb = StringBuilder()
|
|
||||||
for ((i, arg) in args.list.withIndex()) {
|
|
||||||
if (i > 0) sb.append(" ")
|
|
||||||
sb.append(arg.toString(requireScope()).value)
|
|
||||||
}
|
|
||||||
console.print(sb.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
|
|
||||||
ObjVoid
|
|
||||||
}
|
|
||||||
|
|
||||||
console.print("--- Running $fileName ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
|
||||||
val result = lyngScope.eval(Source(fileName, text))
|
|
||||||
console.print("\n--- Finished with result: ${result.inspect(lyngScope)} ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
console.print("\n--- Error ---\n", ConsoleViewContentType.ERROR_OUTPUT)
|
|
||||||
if( t is ExecutionError ) {
|
|
||||||
val m = t.errorObject.getLyngExceptionMessageWithStackTrace()
|
|
||||||
console.print(m, ConsoleViewContentType.ERROR_OUTPUT)
|
|
||||||
}
|
|
||||||
else
|
|
||||||
console.print(t.message ?: t.toString(), ConsoleViewContentType.ERROR_OUTPUT)
|
|
||||||
console.print("\n", ConsoleViewContentType.ERROR_OUTPUT)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -88,11 +88,13 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
// Imports: each segment as namespace/path
|
// Imports: each segment as namespace/path
|
||||||
mini?.imports?.forEach { imp ->
|
mini?.imports?.forEach { imp ->
|
||||||
imp.segments.forEach { seg ->
|
imp.segments.forEach { seg ->
|
||||||
|
if (seg.range.start.source === analysis.source && seg.range.end.source === analysis.source) {
|
||||||
val start = analysis.source.offsetOf(seg.range.start)
|
val start = analysis.source.offsetOf(seg.range.start)
|
||||||
val end = analysis.source.offsetOf(seg.range.end)
|
val end = analysis.source.offsetOf(seg.range.end)
|
||||||
putRange(start, end, LyngHighlighterColors.NAMESPACE)
|
putRange(start, end, LyngHighlighterColors.NAMESPACE)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Add annotation/label coloring using token highlighter
|
// Add annotation/label coloring using token highlighter
|
||||||
run {
|
run {
|
||||||
|
|||||||
@@ -24,6 +24,7 @@ import com.intellij.openapi.editor.Editor
|
|||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.idea.LyngLanguage
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
import net.sergeych.lyng.idea.util.LyngAstManager
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
@@ -75,7 +76,51 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
|
|
||||||
// Single-source quick doc lookup
|
// Single-source quick doc lookup
|
||||||
LyngLanguageTools.docAt(analysis, offset)?.let { info ->
|
LyngLanguageTools.docAt(analysis, offset)?.let { info ->
|
||||||
renderDocFromInfo(info)?.let { return it }
|
val enriched = if (info.doc == null) {
|
||||||
|
findDocInDeclarationFiles(file, info.target.containerName, info.target.name)
|
||||||
|
?.let { info.copy(doc = it) } ?: info
|
||||||
|
} else {
|
||||||
|
info
|
||||||
|
}
|
||||||
|
renderDocFromInfo(enriched)?.let { return it }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fallback: resolve references against merged MiniAst (including .lyng.d) when binder cannot
|
||||||
|
run {
|
||||||
|
val dotPos = DocLookupUtils.findDotLeft(text, idRange.startOffset)
|
||||||
|
if (dotPos != null) {
|
||||||
|
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported, analysis.binding)
|
||||||
|
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported, mini)
|
||||||
|
if (receiverClass != null) {
|
||||||
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, receiverClass, ident, mini)
|
||||||
|
if (resolved != null) {
|
||||||
|
val owner = resolved.first
|
||||||
|
val member = resolved.second
|
||||||
|
val withDoc = if (member.doc == null) {
|
||||||
|
findDocInDeclarationFiles(file, owner, member.name)?.let { doc ->
|
||||||
|
when (member) {
|
||||||
|
is MiniMemberFunDecl -> member.copy(doc = doc)
|
||||||
|
is MiniMemberValDecl -> member.copy(doc = doc)
|
||||||
|
is MiniMemberTypeAliasDecl -> member.copy(doc = doc)
|
||||||
|
else -> member
|
||||||
|
}
|
||||||
|
} ?: member
|
||||||
|
} else {
|
||||||
|
member
|
||||||
|
}
|
||||||
|
return when (withDoc) {
|
||||||
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, withDoc)
|
||||||
|
is MiniMemberValDecl -> renderMemberValDoc(owner, withDoc)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, withDoc)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
mini.declarations.firstOrNull { it.name == ident }?.let { decl ->
|
||||||
|
return renderDeclDoc(decl, text, mini, imported)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Try resolve to: function param at position, function/class/val declaration at position
|
// Try resolve to: function param at position, function/class/val declaration at position
|
||||||
@@ -570,6 +615,55 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun findDocInDeclarationFiles(file: PsiFile, container: String?, name: String): MiniDoc? {
|
||||||
|
val declFiles = LyngAstManager.getDeclarationFiles(file)
|
||||||
|
if (declFiles.isEmpty()) return null
|
||||||
|
|
||||||
|
fun findInMini(mini: MiniScript): MiniDoc? {
|
||||||
|
if (container == null) {
|
||||||
|
mini.declarations.firstOrNull { it.name == name }?.let { return it.doc }
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
val cls = mini.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == container } ?: return null
|
||||||
|
cls.members.firstOrNull { it.name == name }?.let { return it.doc }
|
||||||
|
cls.ctorFields.firstOrNull { it.name == name }?.let { return null }
|
||||||
|
cls.classFields.firstOrNull { it.name == name }?.let { return null }
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
for (df in declFiles) {
|
||||||
|
val mini = LyngAstManager.getMiniAst(df)
|
||||||
|
?: run {
|
||||||
|
try {
|
||||||
|
val res = runBlocking {
|
||||||
|
LyngLanguageTools.analyze(df.text, df.name)
|
||||||
|
}
|
||||||
|
res.mini
|
||||||
|
} catch (_: Throwable) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (mini != null) {
|
||||||
|
val doc = findInMini(mini)
|
||||||
|
if (doc != null) return doc
|
||||||
|
}
|
||||||
|
// Text fallback: parse preceding doc comment for the symbol
|
||||||
|
val parsed = parseDocFromText(df.text, name)
|
||||||
|
if (parsed != null) return parsed
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun parseDocFromText(text: String, name: String): MiniDoc? {
|
||||||
|
if (text.isBlank()) return null
|
||||||
|
val pattern = Regex("/\\*\\*([\\s\\S]*?)\\*/\\s*(?:public|private|protected|static|abstract|extern|open|closed|override\\s+)*\\s*(?:fun|val|var|class|interface|enum|type)\\s+$name\\b")
|
||||||
|
val m = pattern.find(text) ?: return null
|
||||||
|
val raw = m.groupValues.getOrNull(1)?.trim() ?: return null
|
||||||
|
if (raw.isBlank()) return null
|
||||||
|
val src = net.sergeych.lyng.Source("<doc>", raw)
|
||||||
|
return MiniDoc.parse(MiniRange(src.startPos, src.startPos), raw.lines())
|
||||||
|
}
|
||||||
|
|
||||||
private fun renderParamDoc(fn: MiniFunDecl, p: MiniParam): String {
|
private fun renderParamDoc(fn: MiniFunDecl, p: MiniParam): String {
|
||||||
val title = "parameter ${p.name}${typeOf(p.type)} in ${fn.name}${signatureOf(fn)}"
|
val title = "parameter ${p.name}${typeOf(p.type)} in ${fn.name}${signatureOf(fn)}"
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
|
|||||||
@@ -35,7 +35,7 @@ class LyngLexer : LexerBase() {
|
|||||||
"fun", "val", "var", "class", "interface", "type", "import", "as",
|
"fun", "val", "var", "class", "interface", "type", "import", "as",
|
||||||
"abstract", "closed", "override", "static", "extern", "open", "private", "protected",
|
"abstract", "closed", "override", "static", "extern", "open", "private", "protected",
|
||||||
"if", "else", "for", "while", "return", "true", "false", "null",
|
"if", "else", "for", "while", "return", "true", "false", "null",
|
||||||
"when", "in", "is", "break", "continue", "try", "catch", "finally",
|
"when", "in", "is", "break", "continue", "try", "catch", "finally", "void",
|
||||||
"get", "set", "object", "enum", "init", "by", "step", "property", "constructor"
|
"get", "set", "object", "enum", "init", "by", "step", "property", "constructor"
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|||||||
@@ -20,12 +20,18 @@ package net.sergeych.lyng.idea.navigation
|
|||||||
import com.intellij.openapi.project.Project
|
import com.intellij.openapi.project.Project
|
||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.*
|
import com.intellij.psi.*
|
||||||
|
import com.intellij.psi.search.FileTypeIndex
|
||||||
import com.intellij.psi.search.FilenameIndex
|
import com.intellij.psi.search.FilenameIndex
|
||||||
import com.intellij.psi.search.GlobalSearchScope
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
|
import net.sergeych.lyng.idea.LyngFileType
|
||||||
import net.sergeych.lyng.idea.util.LyngAstManager
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
import net.sergeych.lyng.idea.util.TextCtx
|
import net.sergeych.lyng.idea.util.TextCtx
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
|
import net.sergeych.lyng.tools.IdeLenientImportProvider
|
||||||
|
import net.sergeych.lyng.tools.LyngAnalysisRequest
|
||||||
|
import net.sergeych.lyng.tools.LyngLanguageTools
|
||||||
|
|
||||||
class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiElement>(element, TextRange(0, element.textLength)) {
|
class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiElement>(element, TextRange(0, element.textLength)) {
|
||||||
|
|
||||||
@@ -58,7 +64,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
|
|
||||||
// We need to find the actual PSI element for this member
|
// We need to find the actual PSI element for this member
|
||||||
val targetFile = findFileForClass(file.project, owner) ?: file
|
val targetFile = findFileForClass(file.project, owner) ?: file
|
||||||
val targetMini = LyngAstManager.getMiniAst(targetFile)
|
val targetMini = loadMini(targetFile)
|
||||||
if (targetMini != null) {
|
if (targetMini != null) {
|
||||||
val targetSrc = targetMini.range.start.source
|
val targetSrc = targetMini.range.start.source
|
||||||
val off = targetSrc.offsetOf(member.nameStart)
|
val off = targetSrc.offsetOf(member.nameStart)
|
||||||
@@ -123,24 +129,37 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun findFileForClass(project: Project, className: String): PsiFile? {
|
private fun findFileForClass(project: Project, className: String): PsiFile? {
|
||||||
val psiManager = PsiManager.getInstance(project)
|
|
||||||
|
|
||||||
// 1. Try file with matching name first (optimization)
|
// 1. Try file with matching name first (optimization)
|
||||||
val matchingFiles = FilenameIndex.getFilesByName(project, "$className.lyng", GlobalSearchScope.projectScope(project))
|
val scope = GlobalSearchScope.projectScope(project)
|
||||||
|
val psiManager = PsiManager.getInstance(project)
|
||||||
|
val matchingFiles = FileTypeIndex.getFiles(LyngFileType, scope)
|
||||||
|
.asSequence()
|
||||||
|
.filter { it.name == "$className.lyng" }
|
||||||
|
.mapNotNull { psiManager.findFile(it) }
|
||||||
|
.toList()
|
||||||
|
val matchingDeclFiles = FileTypeIndex.getFiles(LyngFileType, scope)
|
||||||
|
.asSequence()
|
||||||
|
.filter { it.name == "$className.lyng.d" }
|
||||||
|
.mapNotNull { psiManager.findFile(it) }
|
||||||
|
.toList()
|
||||||
for (file in matchingFiles) {
|
for (file in matchingFiles) {
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
val mini = loadMini(file) ?: continue
|
||||||
if (mini.declarations.any { (it is MiniClassDecl && it.name == className) || (it is MiniEnumDecl && it.name == className) }) {
|
if (mini.declarations.any { isLocalDecl(mini, it) && ((it is MiniClassDecl && it.name == className) || (it is MiniEnumDecl && it.name == className)) }) {
|
||||||
|
return file
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (file in matchingDeclFiles) {
|
||||||
|
val mini = loadMini(file) ?: continue
|
||||||
|
if (mini.declarations.any { isLocalDecl(mini, it) && ((it is MiniClassDecl && it.name == className) || (it is MiniEnumDecl && it.name == className)) }) {
|
||||||
return file
|
return file
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Fallback to full project scan
|
// 2. Fallback to full project scan
|
||||||
val allFiles = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
for (file in collectLyngFiles(project)) {
|
||||||
for (vFile in allFiles) {
|
if (matchingFiles.contains(file) || matchingDeclFiles.contains(file)) continue // already checked
|
||||||
val file = psiManager.findFile(vFile) ?: continue
|
val mini = loadMini(file) ?: continue
|
||||||
if (matchingFiles.contains(file)) continue // already checked
|
if (mini.declarations.any { isLocalDecl(mini, it) && ((it is MiniClassDecl && it.name == className) || (it is MiniEnumDecl && it.name == className)) }) {
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
|
||||||
if (mini.declarations.any { (it is MiniClassDecl && it.name == className) || (it is MiniEnumDecl && it.name == className) }) {
|
|
||||||
return file
|
return file
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,7 +167,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun getPackageName(file: PsiFile): String? {
|
private fun getPackageName(file: PsiFile): String? {
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
val mini = loadMini(file) ?: return null
|
||||||
return try {
|
return try {
|
||||||
val pkg = mini.range.start.source.extractPackageName()
|
val pkg = mini.range.start.source.extractPackageName()
|
||||||
if (pkg.startsWith("lyng.")) pkg else "lyng.$pkg"
|
if (pkg.startsWith("lyng.")) pkg else "lyng.$pkg"
|
||||||
@@ -172,19 +191,19 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
|
|
||||||
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false, allowedPackages: Set<String>? = null): List<ResolveResult> {
|
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false, allowedPackages: Set<String>? = null): List<ResolveResult> {
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
|
||||||
val psiManager = PsiManager.getInstance(project)
|
val psiManager = PsiManager.getInstance(project)
|
||||||
|
|
||||||
for (vFile in files) {
|
for (file in collectLyngFiles(project)) {
|
||||||
val file = psiManager.findFile(vFile) ?: continue
|
|
||||||
|
|
||||||
// Filter by package if requested
|
// Filter by package if requested
|
||||||
if (allowedPackages != null) {
|
if (allowedPackages != null) {
|
||||||
val pkg = getPackageName(file)
|
val pkg = getPackageName(file)
|
||||||
if (pkg == null || pkg !in allowedPackages) continue
|
if (pkg == null) {
|
||||||
|
if (!file.name.endsWith(".lyng.d")) continue
|
||||||
|
} else if (pkg !in allowedPackages) continue
|
||||||
}
|
}
|
||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
val mini = loadMini(file) ?: continue
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
|
|
||||||
fun addIfMatch(dName: String, nameStart: net.sergeych.lyng.Pos, dKind: String) {
|
fun addIfMatch(dName: String, nameStart: net.sergeych.lyng.Pos, dKind: String) {
|
||||||
@@ -197,6 +216,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (d in mini.declarations) {
|
for (d in mini.declarations) {
|
||||||
|
if (!isLocalDecl(mini, d)) continue
|
||||||
if (!membersOnly) {
|
if (!membersOnly) {
|
||||||
val dKind = when(d) {
|
val dKind = when(d) {
|
||||||
is net.sergeych.lyng.miniast.MiniFunDecl -> "Function"
|
is net.sergeych.lyng.miniast.MiniFunDecl -> "Function"
|
||||||
@@ -216,6 +236,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
|
|
||||||
for (m in members) {
|
for (m in members) {
|
||||||
|
if (m.range.start.source != src) continue
|
||||||
val mKind = when(m) {
|
val mKind = when(m) {
|
||||||
is net.sergeych.lyng.miniast.MiniMemberFunDecl -> "Function"
|
is net.sergeych.lyng.miniast.MiniMemberFunDecl -> "Function"
|
||||||
is net.sergeych.lyng.miniast.MiniMemberValDecl -> if (m.mutable) "Variable" else "Value"
|
is net.sergeych.lyng.miniast.MiniMemberValDecl -> if (m.mutable) "Variable" else "Value"
|
||||||
@@ -229,5 +250,42 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return results
|
return results
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun collectLyngFiles(project: Project): List<PsiFile> {
|
||||||
|
val scope = GlobalSearchScope.projectScope(project)
|
||||||
|
val psiManager = PsiManager.getInstance(project)
|
||||||
|
val out = LinkedHashSet<PsiFile>()
|
||||||
|
|
||||||
|
val lyngFiles = FilenameIndex.getAllFilesByExt(project, "lyng", scope)
|
||||||
|
for (vFile in lyngFiles) {
|
||||||
|
psiManager.findFile(vFile)?.let { out.add(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
// Include declaration files (*.lyng.d) which are indexed as extension "d".
|
||||||
|
val dFiles = FilenameIndex.getAllFilesByExt(project, "d", scope)
|
||||||
|
for (vFile in dFiles) {
|
||||||
|
if (!vFile.name.endsWith(".lyng.d")) continue
|
||||||
|
psiManager.findFile(vFile)?.let { out.add(it) }
|
||||||
|
}
|
||||||
|
|
||||||
|
return out.toList()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun loadMini(file: PsiFile): MiniScript? {
|
||||||
|
LyngAstManager.getMiniAst(file)?.let { return it }
|
||||||
|
return try {
|
||||||
|
val provider = IdeLenientImportProvider.create()
|
||||||
|
runBlocking {
|
||||||
|
LyngLanguageTools.analyze(
|
||||||
|
LyngAnalysisRequest(text = file.text, fileName = file.name, importProvider = provider)
|
||||||
|
)
|
||||||
|
}.mini
|
||||||
|
} catch (_: Throwable) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun isLocalDecl(mini: MiniScript, decl: MiniDecl): Boolean =
|
||||||
|
decl.range.start.source == mini.range.start.source
|
||||||
|
|
||||||
override fun getVariants(): Array<Any> = emptyArray()
|
override fun getVariants(): Array<Any> = emptyArray()
|
||||||
}
|
}
|
||||||
@@ -21,20 +21,22 @@ import com.intellij.openapi.application.runReadAction
|
|||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import com.intellij.psi.PsiManager
|
import com.intellij.psi.PsiManager
|
||||||
|
import com.intellij.psi.search.FileTypeIndex
|
||||||
|
import com.intellij.psi.search.FilenameIndex
|
||||||
|
import com.intellij.psi.search.GlobalSearchScope
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import net.sergeych.lyng.binding.BindingSnapshot
|
import net.sergeych.lyng.binding.BindingSnapshot
|
||||||
import net.sergeych.lyng.miniast.DocLookupUtils
|
import net.sergeych.lyng.idea.LyngFileType
|
||||||
import net.sergeych.lyng.miniast.MiniScript
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.tools.IdeLenientImportProvider
|
import net.sergeych.lyng.tools.*
|
||||||
import net.sergeych.lyng.tools.LyngAnalysisRequest
|
|
||||||
import net.sergeych.lyng.tools.LyngAnalysisResult
|
|
||||||
import net.sergeych.lyng.tools.LyngLanguageTools
|
|
||||||
|
|
||||||
object LyngAstManager {
|
object LyngAstManager {
|
||||||
private val MINI_KEY = Key.create<MiniScript>("lyng.mini.cache")
|
private val MINI_KEY = Key.create<MiniScript>("lyng.mini.cache")
|
||||||
private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
|
private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
|
||||||
private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
|
private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
|
||||||
private val ANALYSIS_KEY = Key.create<LyngAnalysisResult>("lyng.analysis.cache")
|
private val ANALYSIS_KEY = Key.create<LyngAnalysisResult>("lyng.analysis.cache")
|
||||||
|
private val implicitBuiltinNames = setOf("void")
|
||||||
|
private val includeSymbolsDirective = Regex("""(?im)^\s*//\s*include\s+symbols\s*:\s*(.+?)\s*$""")
|
||||||
|
|
||||||
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
||||||
getAnalysis(file)?.mini
|
getAnalysis(file)?.mini
|
||||||
@@ -43,8 +45,8 @@ object LyngAstManager {
|
|||||||
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
||||||
var combinedStamp = file.viewProvider.modificationStamp
|
var combinedStamp = file.viewProvider.modificationStamp
|
||||||
if (!file.name.endsWith(".lyng.d")) {
|
if (!file.name.endsWith(".lyng.d")) {
|
||||||
collectDeclarationFiles(file).forEach { df ->
|
collectDeclarationFiles(file).forEach { symbolsFile ->
|
||||||
combinedStamp += df.viewProvider.modificationStamp
|
combinedStamp += symbolsFile.viewProvider.modificationStamp
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
combinedStamp
|
combinedStamp
|
||||||
@@ -52,22 +54,81 @@ object LyngAstManager {
|
|||||||
|
|
||||||
private fun collectDeclarationFiles(file: PsiFile): List<PsiFile> = runReadAction {
|
private fun collectDeclarationFiles(file: PsiFile): List<PsiFile> = runReadAction {
|
||||||
val psiManager = PsiManager.getInstance(file.project)
|
val psiManager = PsiManager.getInstance(file.project)
|
||||||
var current = file.virtualFile?.parent
|
|
||||||
val seen = mutableSetOf<String>()
|
val seen = mutableSetOf<String>()
|
||||||
val result = mutableListOf<PsiFile>()
|
val result = mutableListOf<PsiFile>()
|
||||||
|
|
||||||
while (current != null) {
|
var currentDir = file.containingDirectory
|
||||||
for (child in current.children) {
|
while (currentDir != null) {
|
||||||
if (child.name.endsWith(".lyng.d") && child != file.virtualFile && seen.add(child.path)) {
|
for (child in currentDir.files) {
|
||||||
val psiD = psiManager.findFile(child) ?: continue
|
if (child.name.endsWith(".lyng.d") && child != file && seen.add(child.virtualFile.path)) {
|
||||||
result.add(psiD)
|
result.add(child)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
current = current.parent
|
currentDir = currentDir.parentDirectory
|
||||||
|
}
|
||||||
|
|
||||||
|
val includeSpecs = includeSymbolsDirective.findAll(file.viewProvider.contents)
|
||||||
|
.flatMap { it.groupValues[1].split(',').asSequence() }
|
||||||
|
.map { it.trim() }
|
||||||
|
.filter { it.isNotEmpty() }
|
||||||
|
.toList()
|
||||||
|
val baseDir = file.virtualFile?.parent
|
||||||
|
if (baseDir != null) {
|
||||||
|
for (spec in includeSpecs) {
|
||||||
|
val included = baseDir.findFileByRelativePath(spec) ?: continue
|
||||||
|
if (included.path == file.virtualFile?.path) continue
|
||||||
|
if (seen.add(included.path)) {
|
||||||
|
psiManager.findFile(included)?.let { result.add(it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.isNotEmpty()) return@runReadAction result
|
||||||
|
|
||||||
|
// Fallback for virtual/light files without a stable parent chain (e.g., tests)
|
||||||
|
val basePath = file.virtualFile?.path ?: return@runReadAction result
|
||||||
|
val scope = GlobalSearchScope.projectScope(file.project)
|
||||||
|
val dFiles = FilenameIndex.getAllFilesByExt(file.project, "d", scope)
|
||||||
|
for (vFile in dFiles) {
|
||||||
|
if (!vFile.name.endsWith(".lyng.d")) continue
|
||||||
|
if (vFile.path == basePath) continue
|
||||||
|
val parentPath = vFile.parent?.path ?: continue
|
||||||
|
if (basePath == parentPath || basePath.startsWith(parentPath.trimEnd('/') + "/")) {
|
||||||
|
if (seen.add(vFile.path)) {
|
||||||
|
psiManager.findFile(vFile)?.let { result.add(it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.isNotEmpty()) return@runReadAction result
|
||||||
|
|
||||||
|
// Fallback: scan all Lyng files in project index and filter by .lyng.d
|
||||||
|
val lyngFiles = FileTypeIndex.getFiles(LyngFileType, scope)
|
||||||
|
for (vFile in lyngFiles) {
|
||||||
|
if (!vFile.name.endsWith(".lyng.d")) continue
|
||||||
|
if (vFile.path == basePath) continue
|
||||||
|
if (seen.add(vFile.path)) {
|
||||||
|
psiManager.findFile(vFile)?.let { result.add(it) }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (result.isNotEmpty()) return@runReadAction result
|
||||||
|
|
||||||
|
// Final fallback: include all .lyng.d files in project scope
|
||||||
|
for (vFile in dFiles) {
|
||||||
|
if (!vFile.name.endsWith(".lyng.d")) continue
|
||||||
|
if (vFile.path == basePath) continue
|
||||||
|
if (seen.add(vFile.path)) {
|
||||||
|
psiManager.findFile(vFile)?.let { result.add(it) }
|
||||||
|
}
|
||||||
}
|
}
|
||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun getDeclarationFiles(file: PsiFile): List<PsiFile> = runReadAction {
|
||||||
|
collectDeclarationFiles(file)
|
||||||
|
}
|
||||||
|
|
||||||
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
||||||
getAnalysis(file)?.binding
|
getAnalysis(file)?.binding
|
||||||
}
|
}
|
||||||
@@ -92,20 +153,38 @@ object LyngAstManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (built != null) {
|
if (built != null) {
|
||||||
val merged = built.mini
|
val isDecl = file.name.endsWith(".lyng.d")
|
||||||
if (merged != null && !file.name.endsWith(".lyng.d")) {
|
val merged = if (!isDecl && built.mini == null) {
|
||||||
|
MiniScript(MiniRange(built.source.startPos, built.source.startPos))
|
||||||
|
} else {
|
||||||
|
built.mini
|
||||||
|
}
|
||||||
|
if (merged != null && !isDecl) {
|
||||||
val dFiles = collectDeclarationFiles(file)
|
val dFiles = collectDeclarationFiles(file)
|
||||||
for (df in dFiles) {
|
for (df in dFiles) {
|
||||||
val dAnalysis = getAnalysis(df)
|
val dMini = getAnalysis(df)?.mini ?: run {
|
||||||
val dMini = dAnalysis?.mini ?: continue
|
val dText = df.viewProvider.contents.toString()
|
||||||
|
try {
|
||||||
|
val provider = IdeLenientImportProvider.create()
|
||||||
|
runBlocking {
|
||||||
|
LyngLanguageTools.analyze(
|
||||||
|
LyngAnalysisRequest(text = dText, fileName = df.name, importProvider = provider)
|
||||||
|
)
|
||||||
|
}.mini
|
||||||
|
} catch (_: Throwable) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
} ?: continue
|
||||||
merged.declarations.addAll(dMini.declarations)
|
merged.declarations.addAll(dMini.declarations)
|
||||||
merged.imports.addAll(dMini.imports)
|
merged.imports.addAll(dMini.imports)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val finalAnalysis = if (merged != null) {
|
val finalAnalysis = if (merged != null) {
|
||||||
|
val mergedImports = DocLookupUtils.canonicalImportedModules(merged, text)
|
||||||
built.copy(
|
built.copy(
|
||||||
mini = merged,
|
mini = merged,
|
||||||
importedModules = DocLookupUtils.canonicalImportedModules(merged, text)
|
importedModules = mergedImports,
|
||||||
|
diagnostics = filterDiagnostics(built.diagnostics, merged, text, mergedImports)
|
||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
built
|
built
|
||||||
@@ -118,4 +197,45 @@ object LyngAstManager {
|
|||||||
}
|
}
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun filterDiagnostics(
|
||||||
|
diagnostics: List<LyngDiagnostic>,
|
||||||
|
merged: MiniScript,
|
||||||
|
text: String,
|
||||||
|
importedModules: List<String>
|
||||||
|
): List<LyngDiagnostic> {
|
||||||
|
if (diagnostics.isEmpty()) return diagnostics
|
||||||
|
val declaredTopLevel = merged.declarations.map { it.name }.toSet()
|
||||||
|
|
||||||
|
val declaredMembers = linkedSetOf<String>()
|
||||||
|
val aggregatedClasses = DocLookupUtils.aggregateClasses(importedModules, merged)
|
||||||
|
for (cls in aggregatedClasses.values) {
|
||||||
|
cls.members.forEach { declaredMembers.add(it.name) }
|
||||||
|
cls.ctorFields.forEach { declaredMembers.add(it.name) }
|
||||||
|
cls.classFields.forEach { declaredMembers.add(it.name) }
|
||||||
|
}
|
||||||
|
merged.declarations.filterIsInstance<MiniEnumDecl>().forEach { en ->
|
||||||
|
DocLookupUtils.enumToSyntheticClass(en).members.forEach { declaredMembers.add(it.name) }
|
||||||
|
}
|
||||||
|
|
||||||
|
val builtinTopLevel = linkedSetOf<String>()
|
||||||
|
for (mod in importedModules) {
|
||||||
|
BuiltinDocRegistry.docsForModule(mod).forEach { builtinTopLevel.add(it.name) }
|
||||||
|
}
|
||||||
|
|
||||||
|
return diagnostics.filterNot { diag ->
|
||||||
|
val msg = diag.message
|
||||||
|
if (msg.startsWith("unresolved name: ")) {
|
||||||
|
val name = msg.removePrefix("unresolved name: ").trim()
|
||||||
|
name in declaredTopLevel || name in builtinTopLevel || name in implicitBuiltinNames
|
||||||
|
} else if (msg.startsWith("unresolved member: ")) {
|
||||||
|
val name = msg.removePrefix("unresolved member: ").trim()
|
||||||
|
val range = diag.range
|
||||||
|
val dotLeft = if (range != null) DocLookupUtils.findDotLeft(text, range.start) else null
|
||||||
|
dotLeft != null && name in declaredMembers
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+182
@@ -0,0 +1,182 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.definitions
|
||||||
|
|
||||||
|
import com.intellij.testFramework.fixtures.BasePlatformTestCase
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import net.sergeych.lyng.idea.docs.LyngDocumentationProvider
|
||||||
|
import net.sergeych.lyng.idea.navigation.LyngPsiReference
|
||||||
|
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
||||||
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
|
import net.sergeych.lyng.miniast.CompletionEngineLight
|
||||||
|
|
||||||
|
class LyngDefinitionFilesTest : BasePlatformTestCase() {
|
||||||
|
|
||||||
|
override fun getTestDataPath(): String = ""
|
||||||
|
|
||||||
|
private fun enableCompletion() {
|
||||||
|
LyngFormatterSettings.getInstance(project).enableLyngCompletionExperimental = true
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun addDefinitionsFile() {
|
||||||
|
val defs = """
|
||||||
|
/** Utilities exposed via .lyng.d */
|
||||||
|
class Declared(val name: String) {
|
||||||
|
/** Size property */
|
||||||
|
val size: Int = 0
|
||||||
|
|
||||||
|
/** Returns greeting. */
|
||||||
|
fun greet(who: String): String = "hi " + who
|
||||||
|
}
|
||||||
|
|
||||||
|
/** Top-level function. */
|
||||||
|
fun topFun(x: Int): Int = x + 1
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.addFileToProject("api.lyng.d", defs)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun addPlainSymbolsFile() {
|
||||||
|
val defs = """
|
||||||
|
/** Symbols exposed via include directive */
|
||||||
|
class PlainDeclared(val name: String) {
|
||||||
|
fun hello(): String = "ok"
|
||||||
|
}
|
||||||
|
|
||||||
|
fun plainTopFun(x: Int): Int = x + 2
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.addFileToProject("plain_symbols.lyng", defs)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_CompletionsIncludeDefinitions() {
|
||||||
|
addDefinitionsFile()
|
||||||
|
enableCompletion()
|
||||||
|
run {
|
||||||
|
val code = """
|
||||||
|
val v = top<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val text = myFixture.editor.document.text
|
||||||
|
val caret = myFixture.caretOffset
|
||||||
|
val analysis = LyngAstManager.getAnalysis(myFixture.file)
|
||||||
|
val engine = runBlocking { CompletionEngineLight.completeSuspend(text, caret, analysis?.mini, analysis?.binding).map { it.name } }
|
||||||
|
assertTrue("Expected topFun from .lyng.d; got=$engine", engine.contains("topFun"))
|
||||||
|
}
|
||||||
|
run {
|
||||||
|
val code = """
|
||||||
|
<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("other.lyng", code)
|
||||||
|
val text = myFixture.editor.document.text
|
||||||
|
val caret = myFixture.caretOffset
|
||||||
|
val analysis = LyngAstManager.getAnalysis(myFixture.file)
|
||||||
|
val engine = runBlocking { CompletionEngineLight.completeSuspend(text, caret, analysis?.mini, analysis?.binding).map { it.name } }
|
||||||
|
assertTrue("Expected Declared from .lyng.d; got=$engine", engine.contains("Declared"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_GotoDefinitionResolvesToDefinitionFile() {
|
||||||
|
addDefinitionsFile()
|
||||||
|
val code = """
|
||||||
|
val x = topFun(1)
|
||||||
|
val y = Declared("x")
|
||||||
|
y.gre<caret>et("me")
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val offset = myFixture.caretOffset
|
||||||
|
val element = myFixture.file.findElementAt(offset) ?: myFixture.file.findElementAt((offset - 1).coerceAtLeast(0))
|
||||||
|
assertNotNull("Expected element at caret for resolve", element)
|
||||||
|
val ref = LyngPsiReference(element!!)
|
||||||
|
val resolved = ref.resolve()
|
||||||
|
assertNotNull("Expected reference to resolve", resolved)
|
||||||
|
assertTrue("Expected .lyng.d target; got=${resolved!!.containingFile.name}", resolved.containingFile.name.endsWith(".lyng.d"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_QuickDocUsesDefinitionDocs() {
|
||||||
|
addDefinitionsFile()
|
||||||
|
val code = """
|
||||||
|
val y = Declared("x")
|
||||||
|
y.gre<caret>et("me")
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val provider = LyngDocumentationProvider()
|
||||||
|
val offset = myFixture.caretOffset
|
||||||
|
val element = myFixture.file.findElementAt(offset) ?: myFixture.file.findElementAt((offset - 1).coerceAtLeast(0))
|
||||||
|
assertNotNull("Expected element at caret for doc", element)
|
||||||
|
val doc = provider.generateDoc(element, element)
|
||||||
|
assertNotNull("Expected Quick Doc", doc)
|
||||||
|
assertTrue("Doc should include summary; got=$doc", doc!!.contains("Returns greeting"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_DiagnosticsIgnoreDefinitionSymbols() {
|
||||||
|
addDefinitionsFile()
|
||||||
|
val code = """
|
||||||
|
val x = topFun(1)
|
||||||
|
val y = Declared("x")
|
||||||
|
y.greet("me")
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val analysis = LyngAstManager.getAnalysis(myFixture.file)
|
||||||
|
val messages = analysis?.diagnostics?.map { it.message } ?: emptyList()
|
||||||
|
assertTrue("Should not report unresolved name for topFun", messages.none { it.contains("unresolved name: topFun") })
|
||||||
|
assertTrue("Should not report unresolved name for Declared", messages.none { it.contains("unresolved name: Declared") })
|
||||||
|
assertTrue("Should not report unresolved member for greet", messages.none { it.contains("unresolved member: greet") })
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_DiagnosticsDoNotReportVoidAsUnresolvedName() {
|
||||||
|
val code = """
|
||||||
|
fun f(): void {
|
||||||
|
return void
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val analysis = LyngAstManager.getAnalysis(myFixture.file)
|
||||||
|
val messages = analysis?.diagnostics?.map { it.message } ?: emptyList()
|
||||||
|
assertTrue("Should not report unresolved name for void, got=$messages", messages.none { it.contains("unresolved name: void") })
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_CompletionsIncludePlainLyngViaDirective() {
|
||||||
|
addPlainSymbolsFile()
|
||||||
|
enableCompletion()
|
||||||
|
val code = """
|
||||||
|
// include symbols: plain_symbols.lyng
|
||||||
|
val v = plainTop<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val text = myFixture.editor.document.text
|
||||||
|
val caret = myFixture.caretOffset
|
||||||
|
val analysis = LyngAstManager.getAnalysis(myFixture.file)
|
||||||
|
val engine = runBlocking { CompletionEngineLight.completeSuspend(text, caret, analysis?.mini, analysis?.binding).map { it.name } }
|
||||||
|
assertTrue("Expected plainTopFun from included .lyng; got=$engine", engine.contains("plainTopFun"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_DiagnosticsIgnorePlainLyngSymbolsViaDirective() {
|
||||||
|
addPlainSymbolsFile()
|
||||||
|
val code = """
|
||||||
|
// include symbols: plain_symbols.lyng
|
||||||
|
val x = plainTopFun(1)
|
||||||
|
val y = PlainDeclared("x")
|
||||||
|
y.hello()
|
||||||
|
""".trimIndent()
|
||||||
|
myFixture.configureByText("main.lyng", code)
|
||||||
|
val analysis = LyngAstManager.getAnalysis(myFixture.file)
|
||||||
|
val messages = analysis?.diagnostics?.map { it.message } ?: emptyList()
|
||||||
|
assertTrue("Should not report unresolved name for plainTopFun", messages.none { it.contains("unresolved name: plainTopFun") })
|
||||||
|
assertTrue("Should not report unresolved name for PlainDeclared", messages.none { it.contains("unresolved name: PlainDeclared") })
|
||||||
|
assertTrue("Should not report unresolved member for hello", messages.none { it.contains("unresolved member: hello") })
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -32,8 +32,10 @@ import net.sergeych.lyng.LyngVersion
|
|||||||
import net.sergeych.lyng.Script
|
import net.sergeych.lyng.Script
|
||||||
import net.sergeych.lyng.ScriptError
|
import net.sergeych.lyng.ScriptError
|
||||||
import net.sergeych.lyng.Source
|
import net.sergeych.lyng.Source
|
||||||
|
import net.sergeych.lyng.io.console.createConsoleModule
|
||||||
import net.sergeych.lyng.io.fs.createFs
|
import net.sergeych.lyng.io.fs.createFs
|
||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
|
import net.sergeych.lyngio.console.security.PermitAllConsoleAccessPolicy
|
||||||
import net.sergeych.lyngio.fs.security.PermitAllAccessPolicy
|
import net.sergeych.lyngio.fs.security.PermitAllAccessPolicy
|
||||||
import net.sergeych.mp_tools.globalDefer
|
import net.sergeych.mp_tools.globalDefer
|
||||||
import okio.FileSystem
|
import okio.FileSystem
|
||||||
@@ -69,6 +71,9 @@ val baseScopeDefer = globalDefer {
|
|||||||
// Install lyng.io.fs module with full access by default for the CLI tool's Scope.
|
// Install lyng.io.fs module with full access by default for the CLI tool's Scope.
|
||||||
// Scripts still need to `import lyng.io.fs` to use Path API.
|
// Scripts still need to `import lyng.io.fs` to use Path API.
|
||||||
createFs(PermitAllAccessPolicy, this)
|
createFs(PermitAllAccessPolicy, this)
|
||||||
|
// Install console access by default for interactive CLI scripts.
|
||||||
|
// Scripts still need to `import lyng.io.console` to use it.
|
||||||
|
createConsoleModule(PermitAllConsoleAccessPolicy, this)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -78,6 +78,7 @@ kotlin {
|
|||||||
api(project(":lynglib"))
|
api(project(":lynglib"))
|
||||||
api(libs.okio)
|
api(libs.okio)
|
||||||
api(libs.kotlinx.coroutines.core)
|
api(libs.kotlinx.coroutines.core)
|
||||||
|
api(libs.mordant.core)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
val commonTest by getting {
|
val commonTest by getting {
|
||||||
@@ -94,6 +95,13 @@ kotlin {
|
|||||||
implementation("com.squareup.okio:okio-nodefilesystem:${libs.versions.okioVersion.get()}")
|
implementation("com.squareup.okio:okio-nodefilesystem:${libs.versions.okioVersion.get()}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
val jvmMain by getting {
|
||||||
|
dependencies {
|
||||||
|
implementation(libs.mordant.jvm.jna)
|
||||||
|
implementation("org.jline:jline-reader:3.29.0")
|
||||||
|
implementation("org.jline:jline-terminal:3.29.0")
|
||||||
|
}
|
||||||
|
}
|
||||||
// // For Wasm we use in-memory VFS for now
|
// // For Wasm we use in-memory VFS for now
|
||||||
// val wasmJsMain by getting {
|
// val wasmJsMain by getting {
|
||||||
// dependencies {
|
// dependencies {
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun consoleFlowDebug(message: String, error: Throwable?) {
|
||||||
|
// no-op on Android
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
actual fun getSystemConsole(): LyngConsole = MordantLyngConsole
|
||||||
@@ -0,0 +1,600 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.io.console
|
||||||
|
|
||||||
|
import net.sergeych.lyng.ModuleScope
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.ScopeFacade
|
||||||
|
import net.sergeych.lyng.miniast.*
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjBool
|
||||||
|
import net.sergeych.lyng.obj.ObjIterable
|
||||||
|
import net.sergeych.lyng.obj.ObjIterationFinishedException
|
||||||
|
import net.sergeych.lyng.obj.ObjIterator
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
import net.sergeych.lyng.obj.requiredArg
|
||||||
|
import net.sergeych.lyng.obj.thisAs
|
||||||
|
import net.sergeych.lyng.obj.toObj
|
||||||
|
import net.sergeych.lyng.pacman.ImportManager
|
||||||
|
import net.sergeych.lyng.raiseIllegalOperation
|
||||||
|
import net.sergeych.lyng.requireScope
|
||||||
|
import net.sergeych.lyngio.console.ConsoleEvent
|
||||||
|
import net.sergeych.lyngio.console.ConsoleEventSource
|
||||||
|
import net.sergeych.lyngio.console.LyngConsole
|
||||||
|
import net.sergeych.lyngio.console.getSystemConsole
|
||||||
|
import net.sergeych.lyngio.console.security.ConsoleAccessDeniedException
|
||||||
|
import net.sergeych.lyngio.console.security.ConsoleAccessPolicy
|
||||||
|
import net.sergeych.lyngio.console.security.LyngConsoleSecured
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Install Lyng module `lyng.io.console` into the given scope's ImportManager.
|
||||||
|
*/
|
||||||
|
fun createConsoleModule(policy: ConsoleAccessPolicy, scope: Scope): Boolean =
|
||||||
|
createConsoleModule(policy, scope.importManager)
|
||||||
|
|
||||||
|
fun createConsole(policy: ConsoleAccessPolicy, scope: Scope): Boolean = createConsoleModule(policy, scope)
|
||||||
|
|
||||||
|
/** Same as [createConsoleModule] but with explicit [ImportManager]. */
|
||||||
|
fun createConsoleModule(policy: ConsoleAccessPolicy, manager: ImportManager): Boolean {
|
||||||
|
val name = "lyng.io.console"
|
||||||
|
if (manager.packageNames.contains(name)) return false
|
||||||
|
|
||||||
|
manager.addPackage(name) { module ->
|
||||||
|
buildConsoleModule(module, policy)
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
fun createConsole(policy: ConsoleAccessPolicy, manager: ImportManager): Boolean = createConsoleModule(policy, manager)
|
||||||
|
|
||||||
|
private suspend fun buildConsoleModule(module: ModuleScope, policy: ConsoleAccessPolicy) {
|
||||||
|
val console: LyngConsole = LyngConsoleSecured(getSystemConsole(), policy)
|
||||||
|
|
||||||
|
val consoleType = object : net.sergeych.lyng.obj.ObjClass("Console") {}
|
||||||
|
|
||||||
|
consoleType.apply {
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "isSupported",
|
||||||
|
doc = "Whether console control API is supported on this platform.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
ObjBool(console.isSupported)
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "isTty",
|
||||||
|
doc = "Whether current stdout is attached to an interactive TTY.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
ObjBool(console.isTty())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "ansiLevel",
|
||||||
|
doc = "Detected ANSI color capability: NONE, BASIC16, ANSI256, TRUECOLOR.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
ObjString(console.ansiLevel().name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "geometry",
|
||||||
|
doc = "Current terminal geometry or null.",
|
||||||
|
returns = type("ConsoleGeometry", nullable = true),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.geometry()?.let { ObjConsoleGeometry(it.columns, it.rows) } ?: ObjNull
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "details",
|
||||||
|
doc = "Get consolidated console details.",
|
||||||
|
returns = type("ConsoleDetails"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
val tty = console.isTty()
|
||||||
|
val ansi = console.ansiLevel()
|
||||||
|
val geometry = console.geometry()
|
||||||
|
ObjConsoleDetails(
|
||||||
|
supported = console.isSupported,
|
||||||
|
isTty = tty,
|
||||||
|
ansiLevel = ansi.name,
|
||||||
|
geometry = geometry?.let { ObjConsoleGeometry(it.columns, it.rows) },
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "write",
|
||||||
|
doc = "Write text directly to console output.",
|
||||||
|
params = listOf(ParamDoc("text", type("lyng.String"))),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
val text = requiredArg<ObjString>(0).value
|
||||||
|
console.write(text)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "flush",
|
||||||
|
doc = "Flush console output buffer.",
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.flush()
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "home",
|
||||||
|
doc = "Move cursor to home position (1,1).",
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.write("\u001B[H")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "clear",
|
||||||
|
doc = "Clear the visible screen buffer.",
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.write("\u001B[2J")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "moveTo",
|
||||||
|
doc = "Move cursor to 1-based row and column.",
|
||||||
|
params = listOf(
|
||||||
|
ParamDoc("row", type("lyng.Int")),
|
||||||
|
ParamDoc("column", type("lyng.Int")),
|
||||||
|
),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
val row = requiredArg<net.sergeych.lyng.obj.ObjInt>(0).value
|
||||||
|
val col = requiredArg<net.sergeych.lyng.obj.ObjInt>(1).value
|
||||||
|
console.write("\u001B[${row};${col}H")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "clearLine",
|
||||||
|
doc = "Clear the current line.",
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.write("\u001B[2K")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "enterAltScreen",
|
||||||
|
doc = "Switch to terminal alternate screen buffer.",
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.write("\u001B[?1049h")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "leaveAltScreen",
|
||||||
|
doc = "Return from alternate screen buffer to normal screen.",
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.write("\u001B[?1049l")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "setCursorVisible",
|
||||||
|
doc = "Show or hide the terminal cursor.",
|
||||||
|
params = listOf(ParamDoc("visible", type("lyng.Bool"))),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
val visible = requiredArg<ObjBool>(0).value
|
||||||
|
console.write(if (visible) "\u001B[?25h" else "\u001B[?25l")
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "events",
|
||||||
|
doc = "Endless iterable console event source (resize, keydown, keyup). Use in a loop, often inside launch.",
|
||||||
|
returns = type("ConsoleEventStream"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
console.events().toConsoleEventStream()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc(
|
||||||
|
name = "setRawMode",
|
||||||
|
doc = "Enable or disable raw keyboard mode. Returns true if mode changed.",
|
||||||
|
params = listOf(ParamDoc("enabled", type("lyng.Bool"))),
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
) {
|
||||||
|
consoleGuard {
|
||||||
|
val enabled = requiredArg<ObjBool>(0).value
|
||||||
|
ObjBool(console.setRawMode(enabled))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "Console",
|
||||||
|
value = consoleType,
|
||||||
|
doc = "Console runtime API.",
|
||||||
|
type = type("Console"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "ConsoleGeometry",
|
||||||
|
value = ObjConsoleGeometry.type,
|
||||||
|
doc = "Terminal geometry.",
|
||||||
|
type = type("lyng.Class"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "ConsoleDetails",
|
||||||
|
value = ObjConsoleDetails.type,
|
||||||
|
doc = "Consolidated console capability details.",
|
||||||
|
type = type("lyng.Class"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "ConsoleEvent",
|
||||||
|
value = ObjConsoleEvent.type,
|
||||||
|
doc = "Base class for console events.",
|
||||||
|
type = type("lyng.Class"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "ConsoleResizeEvent",
|
||||||
|
value = ObjConsoleResizeEvent.type,
|
||||||
|
doc = "Terminal resize event.",
|
||||||
|
type = type("lyng.Class"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "ConsoleKeyEvent",
|
||||||
|
value = ObjConsoleKeyEvent.typeObj,
|
||||||
|
doc = "Keyboard event.",
|
||||||
|
type = type("lyng.Class"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
module.addConstDoc(
|
||||||
|
name = "ConsoleEventStream",
|
||||||
|
value = ObjConsoleEventStream.type,
|
||||||
|
doc = "Endless iterable stream of console events.",
|
||||||
|
type = type("lyng.Class"),
|
||||||
|
moduleName = module.packageName
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend inline fun ScopeFacade.consoleGuard(crossinline block: suspend () -> Obj): Obj {
|
||||||
|
return try {
|
||||||
|
block()
|
||||||
|
} catch (e: ConsoleAccessDeniedException) {
|
||||||
|
raiseIllegalOperation(e.reasonDetail ?: "console access denied")
|
||||||
|
} catch (e: Exception) {
|
||||||
|
raiseIllegalOperation(e.message ?: "console error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ConsoleEventSource.toConsoleEventStream(): ObjConsoleEventStream {
|
||||||
|
return ObjConsoleEventStream(this)
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleEventStream(
|
||||||
|
private val source: ConsoleEventSource,
|
||||||
|
) : Obj() {
|
||||||
|
override val objClass: net.sergeych.lyng.obj.ObjClass
|
||||||
|
get() = type
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = net.sergeych.lyng.obj.ObjClass("ConsoleEventStream", ObjIterable).apply {
|
||||||
|
addFnDoc(
|
||||||
|
name = "iterator",
|
||||||
|
doc = "Create an iterator over incoming console events.",
|
||||||
|
returns = type("lyng.Iterator"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
) {
|
||||||
|
val stream = thisAs<ObjConsoleEventStream>()
|
||||||
|
ObjConsoleEventIterator(stream.source)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleEventIterator(
|
||||||
|
private val source: ConsoleEventSource,
|
||||||
|
) : Obj() {
|
||||||
|
private var cached: Obj? = null
|
||||||
|
private var closed = false
|
||||||
|
|
||||||
|
override val objClass: net.sergeych.lyng.obj.ObjClass
|
||||||
|
get() = type
|
||||||
|
|
||||||
|
private suspend fun ensureCached(): Boolean {
|
||||||
|
if (closed) return false
|
||||||
|
if (cached != null) return true
|
||||||
|
val event = source.nextEvent()
|
||||||
|
if (event == null) {
|
||||||
|
closeSource()
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
cached = event.toObjEvent()
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun closeSource() {
|
||||||
|
if (closed) return
|
||||||
|
closed = true
|
||||||
|
source.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun hasNext(): Boolean = ensureCached()
|
||||||
|
|
||||||
|
suspend fun next(scope: Scope): Obj {
|
||||||
|
if (!ensureCached()) {
|
||||||
|
scope.raiseError(ObjIterationFinishedException(scope))
|
||||||
|
}
|
||||||
|
val out = cached ?: scope.raiseError("console iterator internal error: missing cached event")
|
||||||
|
cached = null
|
||||||
|
return out
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = net.sergeych.lyng.obj.ObjClass("ConsoleEventIterator", ObjIterator).apply {
|
||||||
|
addFnDoc(
|
||||||
|
name = "hasNext",
|
||||||
|
doc = "Whether another console event is available.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
) {
|
||||||
|
thisAs<ObjConsoleEventIterator>().hasNext().toObj()
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "next",
|
||||||
|
doc = "Return the next console event.",
|
||||||
|
returns = type("ConsoleEvent"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
) {
|
||||||
|
thisAs<ObjConsoleEventIterator>().next(requireScope())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "cancelIteration",
|
||||||
|
doc = "Stop reading console events and release resources.",
|
||||||
|
returns = type("lyng.Void"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
) {
|
||||||
|
thisAs<ObjConsoleEventIterator>().closeSource()
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ConsoleEvent.toObjEvent(): Obj = when (this) {
|
||||||
|
is ConsoleEvent.Resize -> ObjConsoleResizeEvent(columns, rows)
|
||||||
|
is ConsoleEvent.KeyDown -> ObjConsoleKeyEvent(type = "keydown", key = key, code = code, ctrl = ctrl, alt = alt, shift = shift, meta = meta)
|
||||||
|
is ConsoleEvent.KeyUp -> ObjConsoleKeyEvent(type = "keyup", key = key, code = code, ctrl = ctrl, alt = alt, shift = shift, meta = meta)
|
||||||
|
}
|
||||||
|
|
||||||
|
private abstract class ObjConsoleEventBase(
|
||||||
|
private val eventType: String,
|
||||||
|
final override val objClass: net.sergeych.lyng.obj.ObjClass,
|
||||||
|
) : Obj() {
|
||||||
|
fun eventTypeName(): String = eventType
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleEvent : ObjConsoleEventBase("event", type) {
|
||||||
|
companion object {
|
||||||
|
val type = net.sergeych.lyng.obj.ObjClass("ConsoleEvent").apply {
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "type",
|
||||||
|
doc = "Event type string: resize, keydown, keyup.",
|
||||||
|
type = type("lyng.String"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { ObjString((this.thisObj as ObjConsoleEventBase).eventTypeName()) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleResizeEvent(
|
||||||
|
val columns: Int,
|
||||||
|
val rows: Int,
|
||||||
|
) : ObjConsoleEventBase("resize", type) {
|
||||||
|
companion object {
|
||||||
|
val type = net.sergeych.lyng.obj.ObjClass("ConsoleResizeEvent", ObjConsoleEvent.type).apply {
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "columns",
|
||||||
|
doc = "Terminal width in character cells.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleResizeEvent).columns.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "rows",
|
||||||
|
doc = "Terminal height in character cells.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleResizeEvent).rows.toObj() }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleKeyEvent(
|
||||||
|
type: String,
|
||||||
|
val key: String,
|
||||||
|
val code: String?,
|
||||||
|
val ctrl: Boolean,
|
||||||
|
val alt: Boolean,
|
||||||
|
val shift: Boolean,
|
||||||
|
val meta: Boolean,
|
||||||
|
) : ObjConsoleEventBase(type, typeObj) {
|
||||||
|
companion object {
|
||||||
|
val typeObj = net.sergeych.lyng.obj.ObjClass("ConsoleKeyEvent", ObjConsoleEvent.type).apply {
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "key",
|
||||||
|
doc = "Logical key name (e.g. ArrowLeft, a, Escape).",
|
||||||
|
type = type("lyng.String"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { ObjString((this.thisObj as ObjConsoleKeyEvent).key) }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "code",
|
||||||
|
doc = "Optional hardware/code identifier.",
|
||||||
|
type = type("lyng.String", nullable = true),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = {
|
||||||
|
val code = (this.thisObj as ObjConsoleKeyEvent).code
|
||||||
|
code?.let(::ObjString) ?: ObjNull
|
||||||
|
}
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "ctrl",
|
||||||
|
doc = "Whether Ctrl modifier is pressed.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleKeyEvent).ctrl.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "alt",
|
||||||
|
doc = "Whether Alt modifier is pressed.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleKeyEvent).alt.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "shift",
|
||||||
|
doc = "Whether Shift modifier is pressed.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleKeyEvent).shift.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "meta",
|
||||||
|
doc = "Whether Meta/Super modifier is pressed.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleKeyEvent).meta.toObj() }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleGeometry(
|
||||||
|
val columns: Int,
|
||||||
|
val rows: Int,
|
||||||
|
) : Obj() {
|
||||||
|
override val objClass: net.sergeych.lyng.obj.ObjClass get() = type
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = net.sergeych.lyng.obj.ObjClass("ConsoleGeometry").apply {
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "columns",
|
||||||
|
doc = "Terminal width in character cells.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleGeometry).columns.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "rows",
|
||||||
|
doc = "Terminal height in character cells.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleGeometry).rows.toObj() }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ObjConsoleDetails(
|
||||||
|
val supported: Boolean,
|
||||||
|
val isTty: Boolean,
|
||||||
|
val ansiLevel: String,
|
||||||
|
val geometry: ObjConsoleGeometry?,
|
||||||
|
) : Obj() {
|
||||||
|
override val objClass: net.sergeych.lyng.obj.ObjClass get() = type
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = net.sergeych.lyng.obj.ObjClass("ConsoleDetails").apply {
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "supported",
|
||||||
|
doc = "Whether console API is supported.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleDetails).supported.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "isTty",
|
||||||
|
doc = "Whether output is connected to a TTY.",
|
||||||
|
type = type("lyng.Bool"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleDetails).isTty.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "ansiLevel",
|
||||||
|
doc = "Detected ANSI color capability level.",
|
||||||
|
type = type("lyng.String"),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { ObjString((this.thisObj as ObjConsoleDetails).ansiLevel) }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "geometry",
|
||||||
|
doc = "Current terminal geometry or null.",
|
||||||
|
type = type("ConsoleGeometry", nullable = true),
|
||||||
|
moduleName = "lyng.io.console",
|
||||||
|
getter = { (this.thisObj as ObjConsoleDetails).geometry ?: ObjNull }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal expect fun consoleFlowDebug(message: String, error: Throwable? = null)
|
||||||
@@ -0,0 +1,132 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
/**
|
||||||
|
* ANSI color support level detected for the active console.
|
||||||
|
*/
|
||||||
|
enum class ConsoleAnsiLevel {
|
||||||
|
NONE,
|
||||||
|
BASIC16,
|
||||||
|
ANSI256,
|
||||||
|
TRUECOLOR,
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Console geometry in character cells.
|
||||||
|
*/
|
||||||
|
data class ConsoleGeometry(
|
||||||
|
val columns: Int,
|
||||||
|
val rows: Int,
|
||||||
|
)
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Input/terminal events emitted by the console runtime.
|
||||||
|
*/
|
||||||
|
sealed interface ConsoleEvent {
|
||||||
|
data class Resize(
|
||||||
|
val columns: Int,
|
||||||
|
val rows: Int,
|
||||||
|
) : ConsoleEvent
|
||||||
|
|
||||||
|
data class KeyDown(
|
||||||
|
val key: String,
|
||||||
|
val code: String? = null,
|
||||||
|
val ctrl: Boolean = false,
|
||||||
|
val alt: Boolean = false,
|
||||||
|
val shift: Boolean = false,
|
||||||
|
val meta: Boolean = false,
|
||||||
|
) : ConsoleEvent
|
||||||
|
|
||||||
|
data class KeyUp(
|
||||||
|
val key: String,
|
||||||
|
val code: String? = null,
|
||||||
|
val ctrl: Boolean = false,
|
||||||
|
val alt: Boolean = false,
|
||||||
|
val shift: Boolean = false,
|
||||||
|
val meta: Boolean = false,
|
||||||
|
) : ConsoleEvent
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Pull-based console event source.
|
||||||
|
*
|
||||||
|
* `nextEvent(timeoutMs)` returns:
|
||||||
|
* - next event when available,
|
||||||
|
* - `null` on timeout,
|
||||||
|
* - `null` after close.
|
||||||
|
*/
|
||||||
|
interface ConsoleEventSource {
|
||||||
|
suspend fun nextEvent(timeoutMs: Long = 0L): ConsoleEvent?
|
||||||
|
|
||||||
|
suspend fun close()
|
||||||
|
}
|
||||||
|
|
||||||
|
private object EmptyConsoleEventSource : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? = null
|
||||||
|
|
||||||
|
override suspend fun close() {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Platform-independent console runtime surface.
|
||||||
|
*/
|
||||||
|
interface LyngConsole {
|
||||||
|
val isSupported: Boolean
|
||||||
|
|
||||||
|
suspend fun isTty(): Boolean
|
||||||
|
|
||||||
|
suspend fun geometry(): ConsoleGeometry?
|
||||||
|
|
||||||
|
suspend fun ansiLevel(): ConsoleAnsiLevel
|
||||||
|
|
||||||
|
suspend fun write(text: String)
|
||||||
|
|
||||||
|
suspend fun flush()
|
||||||
|
|
||||||
|
fun events(): ConsoleEventSource
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Set terminal raw input mode. Returns true when mode was changed.
|
||||||
|
*/
|
||||||
|
suspend fun setRawMode(enabled: Boolean): Boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
object UnsupportedLyngConsole : LyngConsole {
|
||||||
|
override val isSupported: Boolean = false
|
||||||
|
|
||||||
|
override suspend fun isTty(): Boolean = false
|
||||||
|
|
||||||
|
override suspend fun geometry(): ConsoleGeometry? = null
|
||||||
|
|
||||||
|
override suspend fun ansiLevel(): ConsoleAnsiLevel = ConsoleAnsiLevel.NONE
|
||||||
|
|
||||||
|
override suspend fun write(text: String) {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun flush() {
|
||||||
|
// no-op
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun events(): ConsoleEventSource = EmptyConsoleEventSource
|
||||||
|
|
||||||
|
override suspend fun setRawMode(enabled: Boolean): Boolean = false
|
||||||
|
}
|
||||||
@@ -0,0 +1,286 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
import com.github.ajalt.mordant.input.KeyboardEvent
|
||||||
|
import com.github.ajalt.mordant.input.RawModeScope
|
||||||
|
import com.github.ajalt.mordant.input.enterRawModeOrNull
|
||||||
|
import com.github.ajalt.mordant.rendering.AnsiLevel
|
||||||
|
import com.github.ajalt.mordant.terminal.Terminal
|
||||||
|
import kotlinx.coroutines.*
|
||||||
|
import kotlinx.coroutines.channels.Channel
|
||||||
|
import kotlinx.coroutines.sync.Mutex
|
||||||
|
import kotlinx.coroutines.sync.withLock
|
||||||
|
import net.sergeych.lyng.ScriptFlowIsNoMoreCollected
|
||||||
|
import net.sergeych.mp_tools.globalLaunch
|
||||||
|
import kotlin.time.Duration.Companion.milliseconds
|
||||||
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
import kotlin.time.TimeSource
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Mordant-backed console runtime implementation.
|
||||||
|
*/
|
||||||
|
object MordantLyngConsole : LyngConsole {
|
||||||
|
private val terminal: Terminal? by lazy {
|
||||||
|
runCatching { Terminal() }.getOrNull()
|
||||||
|
}
|
||||||
|
|
||||||
|
private val stateMutex = Mutex()
|
||||||
|
private var rawModeRequested: Boolean = false
|
||||||
|
private var rawModeScope: RawModeScope? = null
|
||||||
|
|
||||||
|
private suspend fun forceRawModeReset(t: Terminal): Boolean = stateMutex.withLock {
|
||||||
|
if (!rawModeRequested) return@withLock false
|
||||||
|
runCatching { rawModeScope?.close() }
|
||||||
|
.onFailure { consoleFlowDebug("forceRawModeReset: close failed", it) }
|
||||||
|
rawModeScope = null
|
||||||
|
rawModeRequested = false
|
||||||
|
if (!t.terminalInfo.inputInteractive) return@withLock false
|
||||||
|
val reopened = t.enterRawModeOrNull()
|
||||||
|
rawModeScope = reopened
|
||||||
|
rawModeRequested = reopened != null
|
||||||
|
reopened != null
|
||||||
|
}
|
||||||
|
|
||||||
|
override val isSupported: Boolean
|
||||||
|
get() = terminal != null
|
||||||
|
|
||||||
|
override suspend fun isTty(): Boolean {
|
||||||
|
val t = terminal ?: return false
|
||||||
|
return t.terminalInfo.outputInteractive
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun geometry(): ConsoleGeometry? {
|
||||||
|
val t = terminal ?: return null
|
||||||
|
val size = t.updateSize()
|
||||||
|
return ConsoleGeometry(size.width, size.height)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun ansiLevel(): ConsoleAnsiLevel {
|
||||||
|
val t = terminal ?: return ConsoleAnsiLevel.NONE
|
||||||
|
return when (t.terminalInfo.ansiLevel) {
|
||||||
|
AnsiLevel.NONE -> ConsoleAnsiLevel.NONE
|
||||||
|
AnsiLevel.ANSI16 -> ConsoleAnsiLevel.BASIC16
|
||||||
|
AnsiLevel.ANSI256 -> ConsoleAnsiLevel.ANSI256
|
||||||
|
AnsiLevel.TRUECOLOR -> ConsoleAnsiLevel.TRUECOLOR
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun write(text: String) {
|
||||||
|
terminal?.rawPrint(text)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun flush() {
|
||||||
|
// Mordant prints via platform streams immediately.
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun events(): ConsoleEventSource {
|
||||||
|
val t = terminal ?: return object : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? = null
|
||||||
|
|
||||||
|
override suspend fun close() {}
|
||||||
|
}
|
||||||
|
val out = Channel<ConsoleEvent>(Channel.UNLIMITED)
|
||||||
|
val sourceState = Mutex()
|
||||||
|
var running = true
|
||||||
|
|
||||||
|
globalLaunch {
|
||||||
|
var lastWidth = t.updateSize().width
|
||||||
|
var lastHeight = t.updateSize().height
|
||||||
|
val startMark = TimeSource.Monotonic.markNow()
|
||||||
|
var lastHeartbeatMark = startMark
|
||||||
|
var loops = 0L
|
||||||
|
var readAttempts = 0L
|
||||||
|
var readFailures = 0L
|
||||||
|
var keyEvents = 0L
|
||||||
|
var resizeEvents = 0L
|
||||||
|
var rawNullLoops = 0L
|
||||||
|
var lastKeyMark = startMark
|
||||||
|
var lastRawRecoveryMark = startMark
|
||||||
|
|
||||||
|
consoleFlowDebug("events: collector started")
|
||||||
|
try {
|
||||||
|
while (currentCoroutineContext().isActive && sourceState.withLock { running }) {
|
||||||
|
loops += 1
|
||||||
|
val currentSize = runCatching { t.updateSize() }.getOrNull()
|
||||||
|
if (currentSize == null) {
|
||||||
|
delay(150)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (currentSize.width != lastWidth || currentSize.height != lastHeight) {
|
||||||
|
out.trySend(ConsoleEvent.Resize(currentSize.width, currentSize.height))
|
||||||
|
lastWidth = currentSize.width
|
||||||
|
lastHeight = currentSize.height
|
||||||
|
resizeEvents += 1
|
||||||
|
}
|
||||||
|
|
||||||
|
val raw = stateMutex.withLock {
|
||||||
|
if (!rawModeRequested) {
|
||||||
|
null
|
||||||
|
} else {
|
||||||
|
// Recover raw scope lazily if it was dropped due to an earlier read failure.
|
||||||
|
if (rawModeScope == null) {
|
||||||
|
rawModeScope = t.enterRawModeOrNull()
|
||||||
|
if (rawModeScope == null) {
|
||||||
|
consoleFlowDebug("events: failed to reopen raw mode scope")
|
||||||
|
} else {
|
||||||
|
consoleFlowDebug("events: raw mode scope reopened")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
rawModeScope
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (raw == null || !t.terminalInfo.inputInteractive) {
|
||||||
|
rawNullLoops += 1
|
||||||
|
delay(150)
|
||||||
|
if (lastHeartbeatMark.elapsedNow() >= 2.seconds) {
|
||||||
|
consoleFlowDebug(
|
||||||
|
"events: heartbeat loops=$loops reads=$readAttempts readFailures=$readFailures keys=$keyEvents resize=$resizeEvents rawNullLoops=$rawNullLoops rawRequested=$rawModeRequested inputInteractive=${t.terminalInfo.inputInteractive}"
|
||||||
|
)
|
||||||
|
lastHeartbeatMark = TimeSource.Monotonic.markNow()
|
||||||
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
|
||||||
|
readAttempts += 1
|
||||||
|
val readResult = runCatching { raw.readEventOrNull(150.milliseconds) }
|
||||||
|
if (readResult.isFailure) {
|
||||||
|
readFailures += 1
|
||||||
|
consoleFlowDebug("events: readEventOrNull failed; resetting raw scope", readResult.exceptionOrNull())
|
||||||
|
// Raw scope became invalid; close and force reopen on next iteration.
|
||||||
|
stateMutex.withLock {
|
||||||
|
runCatching { rawModeScope?.close() }
|
||||||
|
rawModeScope = null
|
||||||
|
}
|
||||||
|
delay(50)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val ev = readResult.getOrNull()
|
||||||
|
|
||||||
|
val resized = runCatching { t.updateSize() }.getOrNull()
|
||||||
|
if (resized != null && (resized.width != lastWidth || resized.height != lastHeight)) {
|
||||||
|
out.trySend(ConsoleEvent.Resize(resized.width, resized.height))
|
||||||
|
lastWidth = resized.width
|
||||||
|
lastHeight = resized.height
|
||||||
|
}
|
||||||
|
|
||||||
|
when (ev) {
|
||||||
|
is KeyboardEvent -> {
|
||||||
|
keyEvents += 1
|
||||||
|
lastKeyMark = TimeSource.Monotonic.markNow()
|
||||||
|
out.trySend(
|
||||||
|
ConsoleEvent.KeyDown(
|
||||||
|
key = ev.key,
|
||||||
|
code = null,
|
||||||
|
ctrl = ev.ctrl,
|
||||||
|
alt = ev.alt,
|
||||||
|
shift = ev.shift,
|
||||||
|
meta = false,
|
||||||
|
)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> {
|
||||||
|
// Mouse/other events are ignored in Lyng console v1.
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Some terminals silently stop delivering keyboard events while raw reads keep succeeding.
|
||||||
|
// If we had keys before and then prolonged key inactivity, proactively recycle raw scope.
|
||||||
|
if (keyEvents > 0L &&
|
||||||
|
lastKeyMark.elapsedNow() >= 4.seconds &&
|
||||||
|
lastRawRecoveryMark.elapsedNow() >= 4.seconds
|
||||||
|
) {
|
||||||
|
if (rawModeRequested) {
|
||||||
|
consoleFlowDebug("events: key inactivity detected; forcing raw reset")
|
||||||
|
val resetOk = forceRawModeReset(t)
|
||||||
|
if (resetOk) {
|
||||||
|
consoleFlowDebug("events: raw reset succeeded during inactivity recovery")
|
||||||
|
lastKeyMark = TimeSource.Monotonic.markNow()
|
||||||
|
} else {
|
||||||
|
consoleFlowDebug("events: raw reset failed during inactivity recovery")
|
||||||
|
}
|
||||||
|
lastRawRecoveryMark = TimeSource.Monotonic.markNow()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (lastHeartbeatMark.elapsedNow() >= 2.seconds) {
|
||||||
|
consoleFlowDebug(
|
||||||
|
"events: heartbeat loops=$loops reads=$readAttempts readFailures=$readFailures keys=$keyEvents resize=$resizeEvents rawNullLoops=$rawNullLoops rawRequested=$rawModeRequested inputInteractive=${t.terminalInfo.inputInteractive}"
|
||||||
|
)
|
||||||
|
lastHeartbeatMark = TimeSource.Monotonic.markNow()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: CancellationException) {
|
||||||
|
consoleFlowDebug("events: collector cancelled (normal)")
|
||||||
|
// normal
|
||||||
|
} catch (e: ScriptFlowIsNoMoreCollected) {
|
||||||
|
consoleFlowDebug("events: collector stopped by flow consumer (normal)")
|
||||||
|
// normal
|
||||||
|
} catch (e: Exception) {
|
||||||
|
consoleFlowDebug("events: collector loop failed", e)
|
||||||
|
// terminate event source loop
|
||||||
|
} finally {
|
||||||
|
consoleFlowDebug(
|
||||||
|
"events: collector ended uptime=${startMark.elapsedNow().inWholeMilliseconds}ms loops=$loops reads=$readAttempts readFailures=$readFailures keys=$keyEvents resize=$resizeEvents rawNullLoops=$rawNullLoops rawRequested=$rawModeRequested"
|
||||||
|
)
|
||||||
|
out.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return object : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? {
|
||||||
|
if (timeoutMs <= 0L) {
|
||||||
|
return out.receiveCatching().getOrNull()
|
||||||
|
}
|
||||||
|
return withTimeoutOrNull(timeoutMs.milliseconds) {
|
||||||
|
out.receiveCatching().getOrNull()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun close() {
|
||||||
|
sourceState.withLock { running = false }
|
||||||
|
out.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setRawMode(enabled: Boolean): Boolean {
|
||||||
|
val t = terminal ?: return false
|
||||||
|
return stateMutex.withLock {
|
||||||
|
if (enabled) {
|
||||||
|
if (!t.terminalInfo.inputInteractive) return@withLock false
|
||||||
|
if (rawModeRequested) return@withLock false
|
||||||
|
val scope = t.enterRawModeOrNull() ?: return@withLock false
|
||||||
|
rawModeScope = scope
|
||||||
|
rawModeRequested = true
|
||||||
|
consoleFlowDebug("setRawMode(true): enabled")
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
val hadRaw = rawModeRequested || rawModeScope != null
|
||||||
|
rawModeRequested = false
|
||||||
|
val scope = rawModeScope
|
||||||
|
rawModeScope = null
|
||||||
|
runCatching { scope?.close() }
|
||||||
|
.onFailure { consoleFlowDebug("setRawMode(false): close failed", it) }
|
||||||
|
consoleFlowDebug("setRawMode(false): disabled hadRaw=$hadRaw")
|
||||||
|
hadRaw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get the system default console implementation.
|
||||||
|
*/
|
||||||
|
expect fun getSystemConsole(): LyngConsole
|
||||||
+55
@@ -0,0 +1,55 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console.security
|
||||||
|
|
||||||
|
import net.sergeych.lyngio.fs.security.AccessContext
|
||||||
|
import net.sergeych.lyngio.fs.security.AccessDecision
|
||||||
|
import net.sergeych.lyngio.fs.security.Decision
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Primitive console operations for access control decisions.
|
||||||
|
*/
|
||||||
|
sealed interface ConsoleAccessOp {
|
||||||
|
data class WriteText(val length: Int) : ConsoleAccessOp
|
||||||
|
|
||||||
|
data object ReadEvents : ConsoleAccessOp
|
||||||
|
|
||||||
|
data class SetRawMode(val enabled: Boolean) : ConsoleAccessOp
|
||||||
|
}
|
||||||
|
|
||||||
|
class ConsoleAccessDeniedException(
|
||||||
|
val op: ConsoleAccessOp,
|
||||||
|
val reasonDetail: String? = null,
|
||||||
|
) : IllegalStateException("Console access denied for $op" + (reasonDetail?.let { ": $it" } ?: ""))
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Policy interface that decides whether a specific console operation is allowed.
|
||||||
|
*/
|
||||||
|
interface ConsoleAccessPolicy {
|
||||||
|
suspend fun check(op: ConsoleAccessOp, ctx: AccessContext = AccessContext()): AccessDecision
|
||||||
|
|
||||||
|
suspend fun require(op: ConsoleAccessOp, ctx: AccessContext = AccessContext()) {
|
||||||
|
val res = check(op, ctx)
|
||||||
|
if (!res.isAllowed()) throw ConsoleAccessDeniedException(op, res.reason)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
object PermitAllConsoleAccessPolicy : ConsoleAccessPolicy {
|
||||||
|
override suspend fun check(op: ConsoleAccessOp, ctx: AccessContext): AccessDecision =
|
||||||
|
AccessDecision(Decision.Allow)
|
||||||
|
}
|
||||||
+68
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console.security
|
||||||
|
|
||||||
|
import net.sergeych.lyngio.console.*
|
||||||
|
import net.sergeych.lyngio.fs.security.AccessContext
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Decorator that applies a [ConsoleAccessPolicy] to a delegate [LyngConsole].
|
||||||
|
*/
|
||||||
|
class LyngConsoleSecured(
|
||||||
|
private val delegate: LyngConsole,
|
||||||
|
private val policy: ConsoleAccessPolicy,
|
||||||
|
private val ctx: AccessContext = AccessContext(),
|
||||||
|
) : LyngConsole {
|
||||||
|
|
||||||
|
override val isSupported: Boolean
|
||||||
|
get() = delegate.isSupported
|
||||||
|
|
||||||
|
override suspend fun isTty(): Boolean = delegate.isTty()
|
||||||
|
|
||||||
|
override suspend fun geometry(): ConsoleGeometry? = delegate.geometry()
|
||||||
|
|
||||||
|
override suspend fun ansiLevel(): ConsoleAnsiLevel = delegate.ansiLevel()
|
||||||
|
|
||||||
|
override suspend fun write(text: String) {
|
||||||
|
policy.require(ConsoleAccessOp.WriteText(text.length), ctx)
|
||||||
|
delegate.write(text)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun flush() {
|
||||||
|
delegate.flush()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun events(): ConsoleEventSource {
|
||||||
|
val source = delegate.events()
|
||||||
|
return object : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? {
|
||||||
|
policy.require(ConsoleAccessOp.ReadEvents, ctx)
|
||||||
|
return source.nextEvent(timeoutMs)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun close() {
|
||||||
|
source.close()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setRawMode(enabled: Boolean): Boolean {
|
||||||
|
policy.require(ConsoleAccessOp.SetRawMode(enabled), ctx)
|
||||||
|
return delegate.setRawMode(enabled)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,264 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.docs
|
||||||
|
|
||||||
|
import net.sergeych.lyng.miniast.BuiltinDocRegistry
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
|
object ConsoleBuiltinDocs {
|
||||||
|
private var registered = false
|
||||||
|
|
||||||
|
fun ensure() {
|
||||||
|
if (registered) return
|
||||||
|
BuiltinDocRegistry.module("lyng.io.console") {
|
||||||
|
classDoc(
|
||||||
|
name = "Console",
|
||||||
|
doc = "Console runtime API."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "isSupported",
|
||||||
|
doc = "Whether console control API is supported on this platform.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "isTty",
|
||||||
|
doc = "Whether stdout is attached to an interactive TTY.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "ansiLevel",
|
||||||
|
doc = "Detected ANSI color capability: NONE, BASIC16, ANSI256, TRUECOLOR.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "geometry",
|
||||||
|
doc = "Current terminal geometry or null.",
|
||||||
|
returns = type("ConsoleGeometry", nullable = true),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "details",
|
||||||
|
doc = "Get consolidated console details.",
|
||||||
|
returns = type("ConsoleDetails"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "write",
|
||||||
|
doc = "Write text directly to console output.",
|
||||||
|
params = listOf(ParamDoc("text", type("lyng.String"))),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "flush",
|
||||||
|
doc = "Flush console output buffer.",
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "home",
|
||||||
|
doc = "Move cursor to home position (1,1).",
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "clear",
|
||||||
|
doc = "Clear the visible screen buffer.",
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "moveTo",
|
||||||
|
doc = "Move cursor to 1-based row and column.",
|
||||||
|
params = listOf(
|
||||||
|
ParamDoc("row", type("lyng.Int")),
|
||||||
|
ParamDoc("column", type("lyng.Int")),
|
||||||
|
),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "clearLine",
|
||||||
|
doc = "Clear the current line.",
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "enterAltScreen",
|
||||||
|
doc = "Switch to terminal alternate screen buffer.",
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "leaveAltScreen",
|
||||||
|
doc = "Return from alternate screen buffer to normal screen.",
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "setCursorVisible",
|
||||||
|
doc = "Show or hide the terminal cursor.",
|
||||||
|
params = listOf(ParamDoc("visible", type("lyng.Bool"))),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "events",
|
||||||
|
doc = "Endless iterable console event source (resize, keydown, keyup). Use in a loop, often inside launch.",
|
||||||
|
returns = type("ConsoleEventStream"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "setRawMode",
|
||||||
|
doc = "Enable or disable raw keyboard mode. Returns true if mode changed.",
|
||||||
|
params = listOf(ParamDoc("enabled", type("lyng.Bool"))),
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
classDoc(
|
||||||
|
name = "ConsoleEventStream",
|
||||||
|
doc = "Endless iterable stream of console events."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "iterator",
|
||||||
|
doc = "Create an iterator over incoming console events.",
|
||||||
|
returns = type("lyng.Iterator")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
classDoc(
|
||||||
|
name = "ConsoleGeometry",
|
||||||
|
doc = "Terminal geometry."
|
||||||
|
) {
|
||||||
|
field(
|
||||||
|
name = "columns",
|
||||||
|
doc = "Terminal width in character cells.",
|
||||||
|
type = type("lyng.Int")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "rows",
|
||||||
|
doc = "Terminal height in character cells.",
|
||||||
|
type = type("lyng.Int")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
classDoc(
|
||||||
|
name = "ConsoleDetails",
|
||||||
|
doc = "Consolidated console capability details."
|
||||||
|
) {
|
||||||
|
field(
|
||||||
|
name = "supported",
|
||||||
|
doc = "Whether console API is supported.",
|
||||||
|
type = type("lyng.Bool")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "isTty",
|
||||||
|
doc = "Whether output is attached to a TTY.",
|
||||||
|
type = type("lyng.Bool")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "ansiLevel",
|
||||||
|
doc = "Detected ANSI color capability.",
|
||||||
|
type = type("lyng.String")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "geometry",
|
||||||
|
doc = "Current geometry or null.",
|
||||||
|
type = type("ConsoleGeometry", nullable = true)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
classDoc(
|
||||||
|
name = "ConsoleEvent",
|
||||||
|
doc = "Base class for console events."
|
||||||
|
) {
|
||||||
|
field(
|
||||||
|
name = "type",
|
||||||
|
doc = "Event kind string.",
|
||||||
|
type = type("lyng.String")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
classDoc(
|
||||||
|
name = "ConsoleResizeEvent",
|
||||||
|
doc = "Resize event."
|
||||||
|
) {
|
||||||
|
field(
|
||||||
|
name = "type",
|
||||||
|
doc = "Event kind string: resize.",
|
||||||
|
type = type("lyng.String")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "columns",
|
||||||
|
doc = "Terminal width in character cells.",
|
||||||
|
type = type("lyng.Int")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "rows",
|
||||||
|
doc = "Terminal height in character cells.",
|
||||||
|
type = type("lyng.Int")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
classDoc(
|
||||||
|
name = "ConsoleKeyEvent",
|
||||||
|
doc = "Keyboard event."
|
||||||
|
) {
|
||||||
|
field(
|
||||||
|
name = "type",
|
||||||
|
doc = "Event kind string: keydown or keyup.",
|
||||||
|
type = type("lyng.String")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "key",
|
||||||
|
doc = "Logical key name.",
|
||||||
|
type = type("lyng.String")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "code",
|
||||||
|
doc = "Optional hardware code.",
|
||||||
|
type = type("lyng.String", nullable = true)
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "ctrl",
|
||||||
|
doc = "Ctrl modifier state.",
|
||||||
|
type = type("lyng.Bool")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "alt",
|
||||||
|
doc = "Alt modifier state.",
|
||||||
|
type = type("lyng.Bool")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "shift",
|
||||||
|
doc = "Shift modifier state.",
|
||||||
|
type = type("lyng.Bool")
|
||||||
|
)
|
||||||
|
field(
|
||||||
|
name = "meta",
|
||||||
|
doc = "Meta modifier state.",
|
||||||
|
type = type("lyng.Bool")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
valDoc(
|
||||||
|
name = "Console",
|
||||||
|
doc = "Console runtime API.",
|
||||||
|
type = type("Console")
|
||||||
|
)
|
||||||
|
valDoc(name = "ConsoleGeometry", doc = "Terminal geometry class.", type = type("lyng.Class"))
|
||||||
|
valDoc(name = "ConsoleDetails", doc = "Console details class.", type = type("lyng.Class"))
|
||||||
|
valDoc(name = "ConsoleEvent", doc = "Base console event class.", type = type("lyng.Class"))
|
||||||
|
valDoc(name = "ConsoleResizeEvent", doc = "Resize event class.", type = type("lyng.Class"))
|
||||||
|
valDoc(name = "ConsoleKeyEvent", doc = "Keyboard event class.", type = type("lyng.Class"))
|
||||||
|
valDoc(name = "ConsoleEventStream", doc = "Iterable console event stream class.", type = type("lyng.Class"))
|
||||||
|
}
|
||||||
|
registered = true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun getNativeSystemConsole(): LyngConsole = MordantLyngConsole
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun consoleFlowDebug(message: String, error: Throwable?) {
|
||||||
|
// no-op on JS
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
actual fun getSystemConsole(): LyngConsole = MordantLyngConsole
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
import java.io.File
|
||||||
|
import java.time.Instant
|
||||||
|
|
||||||
|
private val flowDebugLogFilePath: String =
|
||||||
|
System.getenv("LYNG_CONSOLE_DEBUG_LOG")
|
||||||
|
?.takeIf { it.isNotBlank() }
|
||||||
|
?: "/tmp/lyng_console_flow_debug.log"
|
||||||
|
|
||||||
|
private val flowDebugLogLock = Any()
|
||||||
|
|
||||||
|
internal actual fun consoleFlowDebug(message: String, error: Throwable?) {
|
||||||
|
runCatching {
|
||||||
|
val line = buildString {
|
||||||
|
append(Instant.now().toString())
|
||||||
|
append(" [console-flow] ")
|
||||||
|
append(message)
|
||||||
|
append('\n')
|
||||||
|
if (error != null) {
|
||||||
|
append(error.stackTraceToString())
|
||||||
|
append('\n')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
synchronized(flowDebugLogLock) {
|
||||||
|
File(flowDebugLogFilePath).appendText(line)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,496 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
import kotlinx.coroutines.channels.Channel
|
||||||
|
import kotlinx.coroutines.sync.Mutex
|
||||||
|
import kotlinx.coroutines.sync.withLock
|
||||||
|
import kotlinx.coroutines.withTimeoutOrNull
|
||||||
|
import org.jline.terminal.Attributes
|
||||||
|
import org.jline.terminal.Terminal
|
||||||
|
import org.jline.terminal.TerminalBuilder
|
||||||
|
import org.jline.utils.NonBlockingReader
|
||||||
|
import java.io.EOFException
|
||||||
|
import java.util.*
|
||||||
|
import java.util.concurrent.atomic.AtomicBoolean
|
||||||
|
import java.util.concurrent.atomic.AtomicLong
|
||||||
|
import java.util.concurrent.atomic.AtomicReference
|
||||||
|
import kotlin.concurrent.thread
|
||||||
|
import kotlin.time.Duration.Companion.milliseconds
|
||||||
|
import kotlin.time.Duration.Companion.seconds
|
||||||
|
import kotlin.time.TimeSource
|
||||||
|
|
||||||
|
/**
|
||||||
|
* JVM console implementation:
|
||||||
|
* - output/capabilities/input use a single JLine terminal instance
|
||||||
|
* to avoid dual-terminal contention.
|
||||||
|
*/
|
||||||
|
object JvmLyngConsole : LyngConsole {
|
||||||
|
private const val DEBUG_REVISION = "jline-r26-force-rebuild-on-noop-recovery-2026-03-19"
|
||||||
|
private val codeSourceLocation: String by lazy {
|
||||||
|
runCatching {
|
||||||
|
JvmLyngConsole::class.java.protectionDomain?.codeSource?.location?.toString()
|
||||||
|
}.getOrNull() ?: "<unknown>"
|
||||||
|
}
|
||||||
|
|
||||||
|
private val terminalRef = AtomicReference<Terminal?>(null)
|
||||||
|
private val terminalInitLock = Any()
|
||||||
|
|
||||||
|
private fun currentTerminal(): Terminal? {
|
||||||
|
val existing = terminalRef.get()
|
||||||
|
if (existing != null) return existing
|
||||||
|
synchronized(terminalInitLock) {
|
||||||
|
val already = terminalRef.get()
|
||||||
|
if (already != null) return already
|
||||||
|
val created = buildTerminal()
|
||||||
|
if (created != null) terminalRef.set(created)
|
||||||
|
return created
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun buildTerminal(): Terminal? {
|
||||||
|
System.setProperty(TerminalBuilder.PROP_DISABLE_DEPRECATED_PROVIDER_WARNING, "true")
|
||||||
|
|
||||||
|
val providerOrders = listOf(
|
||||||
|
"exec",
|
||||||
|
"exec,ffm",
|
||||||
|
null,
|
||||||
|
)
|
||||||
|
for (providers in providerOrders) {
|
||||||
|
val terminal = runCatching {
|
||||||
|
val builder = TerminalBuilder.builder().system(true)
|
||||||
|
if (providers != null) builder.providers(providers)
|
||||||
|
builder.build()
|
||||||
|
}.onFailure {
|
||||||
|
if (providers != null) {
|
||||||
|
consoleFlowDebug("jline-events: terminal build failed providers=$providers", it)
|
||||||
|
} else {
|
||||||
|
consoleFlowDebug("jline-events: terminal build failed default providers", it)
|
||||||
|
}
|
||||||
|
}.getOrNull()
|
||||||
|
if (terminal != null) {
|
||||||
|
val termType = terminal.type.lowercase(Locale.getDefault())
|
||||||
|
if (termType.contains("dumb")) {
|
||||||
|
consoleFlowDebug("jline-events: terminal rejected providers=${providers ?: "<default>"} type=${terminal.type}")
|
||||||
|
runCatching { terminal.close() }
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
consoleFlowDebug("jline-events: terminal built providers=${providers ?: "<default>"} type=${terminal.type}")
|
||||||
|
consoleFlowDebug("jline-events: runtime-marker rev=$DEBUG_REVISION codeSource=$codeSourceLocation")
|
||||||
|
return terminal
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private val stateMutex = Mutex()
|
||||||
|
private var rawModeRequested: Boolean = false
|
||||||
|
private var rawSavedAttributes: Attributes? = null
|
||||||
|
|
||||||
|
private fun enforceRawReadAttrs(term: Terminal) {
|
||||||
|
runCatching {
|
||||||
|
val attrs = term.attributes
|
||||||
|
attrs.setLocalFlag(Attributes.LocalFlag.ICANON, false)
|
||||||
|
attrs.setLocalFlag(Attributes.LocalFlag.ECHO, false)
|
||||||
|
attrs.setControlChar(Attributes.ControlChar.VMIN, 0)
|
||||||
|
attrs.setControlChar(Attributes.ControlChar.VTIME, 1)
|
||||||
|
term.setAttributes(attrs)
|
||||||
|
}.onFailure {
|
||||||
|
consoleFlowDebug("jline-events: enforceRawReadAttrs failed", it)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override val isSupported: Boolean
|
||||||
|
get() = currentTerminal() != null
|
||||||
|
|
||||||
|
override suspend fun isTty(): Boolean {
|
||||||
|
val term = currentTerminal() ?: return false
|
||||||
|
return !term.type.lowercase(Locale.getDefault()).contains("dumb")
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun geometry(): ConsoleGeometry? {
|
||||||
|
val term = currentTerminal() ?: return null
|
||||||
|
val size = runCatching { term.size }.getOrNull() ?: return null
|
||||||
|
if (size.columns <= 0 || size.rows <= 0) return null
|
||||||
|
return ConsoleGeometry(size.columns, size.rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun ansiLevel(): ConsoleAnsiLevel {
|
||||||
|
val colorTerm = (System.getenv("COLORTERM") ?: "").lowercase(Locale.getDefault())
|
||||||
|
val term = (System.getenv("TERM") ?: "").lowercase(Locale.getDefault())
|
||||||
|
return when {
|
||||||
|
colorTerm.contains("truecolor") || colorTerm.contains("24bit") -> ConsoleAnsiLevel.TRUECOLOR
|
||||||
|
term.contains("256color") -> ConsoleAnsiLevel.ANSI256
|
||||||
|
term.isNotBlank() && term != "dumb" -> ConsoleAnsiLevel.BASIC16
|
||||||
|
else -> ConsoleAnsiLevel.NONE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun write(text: String) {
|
||||||
|
val term = currentTerminal() ?: return
|
||||||
|
term.writer().print(text)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun flush() {
|
||||||
|
val term = currentTerminal() ?: return
|
||||||
|
term.writer().flush()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun events(): ConsoleEventSource {
|
||||||
|
var activeTerm = currentTerminal() ?: return object : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? = null
|
||||||
|
|
||||||
|
override suspend fun close() {}
|
||||||
|
}
|
||||||
|
val out = Channel<ConsoleEvent>(Channel.UNLIMITED)
|
||||||
|
val keyEvents = AtomicLong(0L)
|
||||||
|
val keyCodesRead = AtomicLong(0L)
|
||||||
|
val keySendFailures = AtomicLong(0L)
|
||||||
|
val readFailures = AtomicLong(0L)
|
||||||
|
val readerRecoveries = AtomicLong(0L)
|
||||||
|
var lastHeartbeat = TimeSource.Monotonic.markNow()
|
||||||
|
val keyLoopRunning = AtomicBoolean(true)
|
||||||
|
val keyLoopCount = AtomicLong(0L)
|
||||||
|
val keyReadStartNs = AtomicLong(0L)
|
||||||
|
val keyReadEndNs = AtomicLong(0L)
|
||||||
|
val lastKeyReadNs = AtomicLong(System.nanoTime())
|
||||||
|
val lastRecoveryNs = AtomicLong(0L)
|
||||||
|
val recoveryRequested = AtomicBoolean(false)
|
||||||
|
val running = AtomicBoolean(true)
|
||||||
|
var winchHandler: Terminal.SignalHandler? = null
|
||||||
|
var reader = activeTerm.reader()
|
||||||
|
var keyThread: Thread? = null
|
||||||
|
var heartbeatThread: Thread? = null
|
||||||
|
|
||||||
|
fun emitResize() {
|
||||||
|
val size = runCatching { activeTerm.size }.getOrNull() ?: return
|
||||||
|
out.trySend(ConsoleEvent.Resize(size.columns, size.rows))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun cleanup() {
|
||||||
|
running.set(false)
|
||||||
|
keyLoopRunning.set(false)
|
||||||
|
runCatching { reader.shutdown() }
|
||||||
|
runCatching {
|
||||||
|
if (winchHandler != null) {
|
||||||
|
activeTerm.handle(Terminal.Signal.WINCH, winchHandler)
|
||||||
|
}
|
||||||
|
}.onFailure {
|
||||||
|
consoleFlowDebug("jline-events: WINCH handler restore failed", it)
|
||||||
|
}
|
||||||
|
runCatching { keyThread?.interrupt() }
|
||||||
|
runCatching { heartbeatThread?.interrupt() }
|
||||||
|
out.close()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun installWinchHandler() {
|
||||||
|
winchHandler = runCatching {
|
||||||
|
activeTerm.handle(Terminal.Signal.WINCH) {
|
||||||
|
emitResize()
|
||||||
|
}
|
||||||
|
}.onFailure {
|
||||||
|
consoleFlowDebug("jline-events: WINCH handler install failed", it)
|
||||||
|
}.getOrNull()
|
||||||
|
}
|
||||||
|
|
||||||
|
fun tryRebuildTerminal(): Boolean {
|
||||||
|
val oldTerm = activeTerm
|
||||||
|
val rebuilt = runCatching {
|
||||||
|
synchronized(terminalInitLock) {
|
||||||
|
if (terminalRef.get() === oldTerm) {
|
||||||
|
terminalRef.set(null)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
runCatching { oldTerm.close() }
|
||||||
|
.onFailure { consoleFlowDebug("jline-events: old terminal close failed during rebuild", it) }
|
||||||
|
currentTerminal()
|
||||||
|
}.onFailure {
|
||||||
|
consoleFlowDebug("jline-events: terminal rebuild failed", it)
|
||||||
|
}.getOrNull() ?: return false
|
||||||
|
if (rebuilt === oldTerm) {
|
||||||
|
consoleFlowDebug("jline-events: terminal rebuild returned same terminal instance")
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
activeTerm = rebuilt
|
||||||
|
reader = activeTerm.reader()
|
||||||
|
val rawRequestedNow = runCatching { stateMutex.tryLock() }.getOrNull() == true && try {
|
||||||
|
rawModeRequested
|
||||||
|
} finally {
|
||||||
|
stateMutex.unlock()
|
||||||
|
}
|
||||||
|
if (rawRequestedNow) {
|
||||||
|
val saved = runCatching { activeTerm.enterRawMode() }.getOrNull()
|
||||||
|
if (saved != null) {
|
||||||
|
enforceRawReadAttrs(activeTerm)
|
||||||
|
if (runCatching { stateMutex.tryLock() }.getOrNull() == true) {
|
||||||
|
try {
|
||||||
|
rawSavedAttributes = saved
|
||||||
|
} finally {
|
||||||
|
stateMutex.unlock()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
consoleFlowDebug("jline-events: terminal rebuild succeeded but enterRawMode failed")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
installWinchHandler()
|
||||||
|
emitResize()
|
||||||
|
consoleFlowDebug("jline-events: terminal rebuilt and rebound")
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
consoleFlowDebug("jline-events: collector started rev=$DEBUG_REVISION")
|
||||||
|
emitResize()
|
||||||
|
installWinchHandler()
|
||||||
|
|
||||||
|
keyThread = thread(start = true, isDaemon = true, name = "lyng-jline-key-reader") {
|
||||||
|
consoleFlowDebug("jline-events: key-reader thread started")
|
||||||
|
consoleFlowDebug("jline-events: using NonBlockingReader key path")
|
||||||
|
while (running.get() && keyLoopRunning.get()) {
|
||||||
|
keyLoopCount.incrementAndGet()
|
||||||
|
try {
|
||||||
|
if (recoveryRequested.compareAndSet(true, false)) {
|
||||||
|
val prevReader = reader
|
||||||
|
runCatching { prevReader.shutdown() }
|
||||||
|
.onFailure { consoleFlowDebug("jline-events: reader shutdown failed during recovery", it) }
|
||||||
|
|
||||||
|
reader = activeTerm.reader()
|
||||||
|
if (reader.hashCode() == prevReader.hashCode()) {
|
||||||
|
consoleFlowDebug("jline-events: reader recovery no-op oldReader=${prevReader.hashCode()} newReader=${reader.hashCode()} -> forcing terminal rebuild")
|
||||||
|
if (!tryRebuildTerminal()) {
|
||||||
|
consoleFlowDebug("jline-events: forced terminal rebuild did not produce a new reader")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
consoleFlowDebug("jline-events: reader recovered oldReader=${prevReader.hashCode()} newReader=${reader.hashCode()}")
|
||||||
|
}
|
||||||
|
|
||||||
|
readerRecoveries.incrementAndGet()
|
||||||
|
lastRecoveryNs.set(System.nanoTime())
|
||||||
|
}
|
||||||
|
|
||||||
|
val isRaw = runCatching { stateMutex.tryLock() }.getOrNull() == true && try {
|
||||||
|
rawModeRequested
|
||||||
|
} finally {
|
||||||
|
stateMutex.unlock()
|
||||||
|
}
|
||||||
|
if (!isRaw) {
|
||||||
|
Thread.sleep(20)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
keyReadStartNs.set(System.nanoTime())
|
||||||
|
val event = readKeyEvent(reader)
|
||||||
|
keyReadEndNs.set(System.nanoTime())
|
||||||
|
if (event == null) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
keyCodesRead.incrementAndGet()
|
||||||
|
lastKeyReadNs.set(System.nanoTime())
|
||||||
|
if (out.trySend(event).isSuccess) {
|
||||||
|
keyEvents.incrementAndGet()
|
||||||
|
} else {
|
||||||
|
keySendFailures.incrementAndGet()
|
||||||
|
}
|
||||||
|
} catch (_: InterruptedException) {
|
||||||
|
break
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
readFailures.incrementAndGet()
|
||||||
|
consoleFlowDebug("jline-events: blocking read failed", e)
|
||||||
|
try {
|
||||||
|
Thread.sleep(50)
|
||||||
|
} catch (_: InterruptedException) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
heartbeatThread = thread(start = true, isDaemon = true, name = "lyng-jline-heartbeat") {
|
||||||
|
while (running.get()) {
|
||||||
|
if (lastHeartbeat.elapsedNow() >= 2.seconds) {
|
||||||
|
val requested = runCatching { stateMutex.tryLock() }.getOrNull() == true && try {
|
||||||
|
rawModeRequested
|
||||||
|
} finally {
|
||||||
|
stateMutex.unlock()
|
||||||
|
}
|
||||||
|
val readStartNs = keyReadStartNs.get()
|
||||||
|
val readEndNs = keyReadEndNs.get()
|
||||||
|
val lastKeyNs = lastKeyReadNs.get()
|
||||||
|
val idleMs = if (lastKeyNs > 0L) (System.nanoTime() - lastKeyNs) / 1_000_000L else 0L
|
||||||
|
val readBlockedMs = if (readStartNs > 0L && readEndNs < readStartNs) {
|
||||||
|
(System.nanoTime() - readStartNs) / 1_000_000L
|
||||||
|
} else 0L
|
||||||
|
if (requested && keyCodesRead.get() > 0L && idleMs >= 1400L) {
|
||||||
|
val sinceRecoveryMs = (System.nanoTime() - lastRecoveryNs.get()) / 1_000_000L
|
||||||
|
if (sinceRecoveryMs >= 1200L) {
|
||||||
|
recoveryRequested.set(true)
|
||||||
|
consoleFlowDebug("jline-events: key stream idle ${idleMs}ms; scheduling reader recovery")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
consoleFlowDebug(
|
||||||
|
"jline-events: heartbeat keyCodes=${keyCodesRead.get()} keysSent=${keyEvents.get()} sendFailures=${keySendFailures.get()} readFailures=${readFailures.get()} recoveries=${readerRecoveries.get()} rawRequested=$requested keyLoop=${keyLoopCount.get()} readBlockedMs=$readBlockedMs keyIdleMs=$idleMs keyPath=reader"
|
||||||
|
)
|
||||||
|
lastHeartbeat = TimeSource.Monotonic.markNow()
|
||||||
|
}
|
||||||
|
try {
|
||||||
|
Thread.sleep(200)
|
||||||
|
} catch (_: InterruptedException) {
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return object : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? {
|
||||||
|
if (!running.get()) return null
|
||||||
|
if (timeoutMs <= 0L) {
|
||||||
|
return out.receiveCatching().getOrNull()
|
||||||
|
}
|
||||||
|
return withTimeoutOrNull(timeoutMs.milliseconds) {
|
||||||
|
out.receiveCatching().getOrNull()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun close() {
|
||||||
|
cleanup()
|
||||||
|
consoleFlowDebug(
|
||||||
|
"jline-events: collector ended keys=${keyEvents.get()} readFailures=${readFailures.get()}"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setRawMode(enabled: Boolean): Boolean {
|
||||||
|
val term = currentTerminal() ?: return false
|
||||||
|
return stateMutex.withLock {
|
||||||
|
if (enabled) {
|
||||||
|
if (rawModeRequested) return@withLock false
|
||||||
|
val saved = runCatching { term.enterRawMode() }.getOrNull() ?: return@withLock false
|
||||||
|
enforceRawReadAttrs(term)
|
||||||
|
rawSavedAttributes = saved
|
||||||
|
rawModeRequested = true
|
||||||
|
consoleFlowDebug("jline-events: setRawMode(true): enabled")
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
val hadRaw = rawModeRequested
|
||||||
|
rawModeRequested = false
|
||||||
|
val saved = rawSavedAttributes
|
||||||
|
rawSavedAttributes = null
|
||||||
|
runCatching {
|
||||||
|
if (saved != null) term.setAttributes(saved)
|
||||||
|
}.onFailure {
|
||||||
|
consoleFlowDebug("jline-events: setRawMode(false): restore failed", it)
|
||||||
|
}
|
||||||
|
consoleFlowDebug("jline-events: setRawMode(false): disabled hadRaw=$hadRaw")
|
||||||
|
hadRaw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readKeyEvent(reader: NonBlockingReader): ConsoleEvent.KeyDown? {
|
||||||
|
val code = reader.read(120L)
|
||||||
|
if (code == NonBlockingReader.READ_EXPIRED) return null
|
||||||
|
if (code < 0) throw EOFException("non-blocking reader returned EOF")
|
||||||
|
return decodeKey(code) { timeout -> readNextCode(reader, timeout) }
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun decodeKey(code: Int, nextCode: (Long) -> Int?): ConsoleEvent.KeyDown {
|
||||||
|
if (code == 27) {
|
||||||
|
val next = nextCode(25L)
|
||||||
|
if (next == null || next < 0) {
|
||||||
|
return key("Escape")
|
||||||
|
}
|
||||||
|
if (next == '['.code || next == 'O'.code) {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
sb.append(next.toChar())
|
||||||
|
var i = 0
|
||||||
|
while (i < 6) {
|
||||||
|
val c = nextCode(25L) ?: break
|
||||||
|
if (c < 0) break
|
||||||
|
sb.append(c.toChar())
|
||||||
|
if (c.toChar().isLetter() || c == '~'.code) break
|
||||||
|
i += 1
|
||||||
|
}
|
||||||
|
return keyFromAnsiSequence(sb.toString()) ?: key("Escape")
|
||||||
|
}
|
||||||
|
// Alt+key
|
||||||
|
val base = decodePlainKey(next)
|
||||||
|
return ConsoleEvent.KeyDown(
|
||||||
|
key = base.key,
|
||||||
|
code = base.code,
|
||||||
|
ctrl = base.ctrl,
|
||||||
|
alt = true,
|
||||||
|
shift = base.shift,
|
||||||
|
meta = false
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return decodePlainKey(code)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readNextCode(reader: NonBlockingReader, timeoutMs: Long): Int? {
|
||||||
|
val c = reader.read(timeoutMs)
|
||||||
|
if (c == NonBlockingReader.READ_EXPIRED) return null
|
||||||
|
if (c < 0) throw EOFException("non-blocking reader returned EOF while decoding key sequence")
|
||||||
|
return c
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
private fun decodePlainKey(code: Int): ConsoleEvent.KeyDown = when (code) {
|
||||||
|
3 -> key("c", ctrl = true)
|
||||||
|
9 -> key("Tab")
|
||||||
|
10, 13 -> key("Enter")
|
||||||
|
127, 8 -> key("Backspace")
|
||||||
|
32 -> key(" ")
|
||||||
|
else -> {
|
||||||
|
if (code in 1..26) {
|
||||||
|
val ch = ('a'.code + code - 1).toChar().toString()
|
||||||
|
key(ch, ctrl = true)
|
||||||
|
} else {
|
||||||
|
val ch = code.toChar().toString()
|
||||||
|
key(ch, shift = ch.length == 1 && ch[0].isLetter() && ch[0].isUpperCase())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun keyFromAnsiSequence(seq: String): ConsoleEvent.KeyDown? = when (seq) {
|
||||||
|
"[A", "OA" -> key("ArrowUp")
|
||||||
|
"[B", "OB" -> key("ArrowDown")
|
||||||
|
"[C", "OC" -> key("ArrowRight")
|
||||||
|
"[D", "OD" -> key("ArrowLeft")
|
||||||
|
"[H", "OH" -> key("Home")
|
||||||
|
"[F", "OF" -> key("End")
|
||||||
|
"[2~" -> key("Insert")
|
||||||
|
"[3~" -> key("Delete")
|
||||||
|
"[5~" -> key("PageUp")
|
||||||
|
"[6~" -> key("PageDown")
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun key(
|
||||||
|
value: String,
|
||||||
|
ctrl: Boolean = false,
|
||||||
|
alt: Boolean = false,
|
||||||
|
shift: Boolean = false,
|
||||||
|
): ConsoleEvent.KeyDown = ConsoleEvent.KeyDown(
|
||||||
|
key = value,
|
||||||
|
code = null,
|
||||||
|
ctrl = ctrl,
|
||||||
|
alt = alt,
|
||||||
|
shift = shift,
|
||||||
|
meta = false
|
||||||
|
)
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
actual fun getSystemConsole(): LyngConsole = JvmLyngConsole
|
||||||
@@ -0,0 +1,115 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.io.console
|
||||||
|
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import net.sergeych.lyng.ExecutionError
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.obj.ObjBool
|
||||||
|
import net.sergeych.lyng.obj.ObjIllegalOperationException
|
||||||
|
import net.sergeych.lyngio.console.security.ConsoleAccessOp
|
||||||
|
import net.sergeych.lyngio.console.security.ConsoleAccessPolicy
|
||||||
|
import net.sergeych.lyngio.console.security.PermitAllConsoleAccessPolicy
|
||||||
|
import net.sergeych.lyngio.fs.security.AccessContext
|
||||||
|
import net.sergeych.lyngio.fs.security.AccessDecision
|
||||||
|
import net.sergeych.lyngio.fs.security.Decision
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertFalse
|
||||||
|
import kotlin.test.assertIs
|
||||||
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
|
class LyngConsoleModuleTest {
|
||||||
|
|
||||||
|
private fun newScope(): Scope = Scope.new()
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun installIsIdempotent() = runBlocking {
|
||||||
|
val scope = newScope()
|
||||||
|
assertTrue(createConsoleModule(PermitAllConsoleAccessPolicy, scope))
|
||||||
|
assertFalse(createConsoleModule(PermitAllConsoleAccessPolicy, scope))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun moduleSmokeScript() = runBlocking {
|
||||||
|
val scope = newScope()
|
||||||
|
createConsoleModule(PermitAllConsoleAccessPolicy, scope)
|
||||||
|
|
||||||
|
val code = """
|
||||||
|
import lyng.io.console
|
||||||
|
import lyng.stdlib
|
||||||
|
|
||||||
|
val d = Console.details()
|
||||||
|
assert(d.supported is Bool)
|
||||||
|
assert(d.isTty is Bool)
|
||||||
|
assert(d.ansiLevel is String)
|
||||||
|
|
||||||
|
val g = Console.geometry()
|
||||||
|
if (g != null) {
|
||||||
|
assert(g.columns is Int)
|
||||||
|
assert(g.rows is Int)
|
||||||
|
assert(g.columns > 0)
|
||||||
|
assert(g.rows > 0)
|
||||||
|
}
|
||||||
|
|
||||||
|
assert(Console.events() is Iterable)
|
||||||
|
Console.write("")
|
||||||
|
Console.flush()
|
||||||
|
Console.home()
|
||||||
|
Console.clear()
|
||||||
|
Console.moveTo(1, 1)
|
||||||
|
Console.clearLine()
|
||||||
|
Console.enterAltScreen()
|
||||||
|
Console.leaveAltScreen()
|
||||||
|
Console.setCursorVisible(true)
|
||||||
|
|
||||||
|
val changed = Console.setRawMode(false)
|
||||||
|
assert(changed is Bool)
|
||||||
|
true
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val result = scope.eval(code)
|
||||||
|
assertIs<ObjBool>(result)
|
||||||
|
assertTrue(result.value)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun denyWritePolicyMapsToIllegalOperation() {
|
||||||
|
runBlocking {
|
||||||
|
val denyWritePolicy = object : ConsoleAccessPolicy {
|
||||||
|
override suspend fun check(op: ConsoleAccessOp, ctx: AccessContext): AccessDecision = when (op) {
|
||||||
|
is ConsoleAccessOp.WriteText -> AccessDecision(Decision.Deny, "denied by test policy")
|
||||||
|
else -> AccessDecision(Decision.Allow)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val scope = newScope()
|
||||||
|
createConsoleModule(denyWritePolicy, scope)
|
||||||
|
|
||||||
|
val error = kotlin.test.assertFailsWith<ExecutionError> {
|
||||||
|
scope.eval(
|
||||||
|
"""
|
||||||
|
import lyng.io.console
|
||||||
|
Console.write("x")
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
assertIs<ObjIllegalOperationException>(error.errorObject)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,77 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertNotNull
|
||||||
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
|
class MordantLyngConsoleJvmTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun basicCapabilitiesSmoke() = runBlocking {
|
||||||
|
val console = getSystemConsole()
|
||||||
|
assertNotNull(console)
|
||||||
|
|
||||||
|
// Must be callable in any environment (interactive or redirected output).
|
||||||
|
val tty = console.isTty()
|
||||||
|
val ansi = console.ansiLevel()
|
||||||
|
val geometry = console.geometry()
|
||||||
|
|
||||||
|
if (geometry != null) {
|
||||||
|
assertTrue(geometry.columns > 0, "columns must be positive when geometry is present")
|
||||||
|
assertTrue(geometry.rows > 0, "rows must be positive when geometry is present")
|
||||||
|
}
|
||||||
|
|
||||||
|
// no-op smoke checks
|
||||||
|
console.write("")
|
||||||
|
console.flush()
|
||||||
|
|
||||||
|
// Keep values live so compiler doesn't optimize away calls in future changes
|
||||||
|
assertNotNull(ansi)
|
||||||
|
assertTrue(tty || !tty)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun setRawModeContract() = runBlocking {
|
||||||
|
val console = getSystemConsole()
|
||||||
|
val enabledChanged = console.setRawMode(true)
|
||||||
|
val disabledChanged = console.setRawMode(false)
|
||||||
|
|
||||||
|
// If enabling changed state, disabling should also change it back.
|
||||||
|
if (enabledChanged) {
|
||||||
|
assertTrue(disabledChanged, "raw mode disable should report changed after enable")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun eventsSourceDoesNotCrash() = runBlocking {
|
||||||
|
val console = getSystemConsole()
|
||||||
|
val source = console.events()
|
||||||
|
val event = source.nextEvent(350)
|
||||||
|
source.close()
|
||||||
|
// Any event kind is acceptable in this smoke test; null is also valid when idle.
|
||||||
|
if (event != null) {
|
||||||
|
assertTrue(
|
||||||
|
event is ConsoleEvent.Resize || event is ConsoleEvent.KeyDown || event is ConsoleEvent.KeyUp,
|
||||||
|
"unexpected event type: ${event::class.simpleName}"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,243 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
import kotlinx.cinterop.*
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
|
import kotlinx.coroutines.sync.Mutex
|
||||||
|
import kotlinx.coroutines.sync.withLock
|
||||||
|
import platform.posix.*
|
||||||
|
import kotlin.time.Duration.Companion.milliseconds
|
||||||
|
import kotlin.time.TimeSource
|
||||||
|
|
||||||
|
internal actual fun getNativeSystemConsole(): LyngConsole = LinuxPosixLyngConsole
|
||||||
|
|
||||||
|
internal object LinuxConsoleKeyDecoder {
|
||||||
|
fun decode(firstCode: Int, nextCode: (Long) -> Int?): ConsoleEvent.KeyDown {
|
||||||
|
if (firstCode == 27) {
|
||||||
|
val next = nextCode(25L)
|
||||||
|
if (next == null || next < 0) return key("Escape")
|
||||||
|
if (next == '['.code || next == 'O'.code) {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
sb.append(next.toChar())
|
||||||
|
var i = 0
|
||||||
|
while (i < 8) {
|
||||||
|
val c = nextCode(25L) ?: break
|
||||||
|
if (c < 0) break
|
||||||
|
sb.append(c.toChar())
|
||||||
|
if (c.toChar().isLetter() || c == '~'.code) break
|
||||||
|
i += 1
|
||||||
|
}
|
||||||
|
return keyFromAnsiSequence(sb.toString()) ?: key("Escape")
|
||||||
|
}
|
||||||
|
val base = decodePlain(next)
|
||||||
|
return ConsoleEvent.KeyDown(
|
||||||
|
key = base.key,
|
||||||
|
code = base.code,
|
||||||
|
ctrl = base.ctrl,
|
||||||
|
alt = true,
|
||||||
|
shift = base.shift,
|
||||||
|
meta = false,
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return decodePlain(firstCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun decodePlain(code: Int): ConsoleEvent.KeyDown {
|
||||||
|
if (code == 3) return ConsoleEvent.KeyDown(key = "c", ctrl = true)
|
||||||
|
if (code == 9) return key("Tab")
|
||||||
|
if (code == 10 || code == 13) return key("Enter")
|
||||||
|
if (code == 32) return key(" ")
|
||||||
|
if (code == 127 || code == 8) return key("Backspace")
|
||||||
|
val c = code.toChar()
|
||||||
|
return if (c in 'A'..'Z') {
|
||||||
|
ConsoleEvent.KeyDown(key = c.toString(), shift = true)
|
||||||
|
} else {
|
||||||
|
key(c.toString())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun keyFromAnsiSequence(seq: String): ConsoleEvent.KeyDown? {
|
||||||
|
val letter = seq.lastOrNull() ?: return null
|
||||||
|
val shift = seq.contains(";2")
|
||||||
|
val alt = seq.contains(";3")
|
||||||
|
val ctrl = seq.contains(";5")
|
||||||
|
val key = when (letter) {
|
||||||
|
'A' -> "ArrowUp"
|
||||||
|
'B' -> "ArrowDown"
|
||||||
|
'C' -> "ArrowRight"
|
||||||
|
'D' -> "ArrowLeft"
|
||||||
|
'H' -> "Home"
|
||||||
|
'F' -> "End"
|
||||||
|
else -> return null
|
||||||
|
}
|
||||||
|
return ConsoleEvent.KeyDown(key = key, ctrl = ctrl, alt = alt, shift = shift)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun key(name: String): ConsoleEvent.KeyDown = ConsoleEvent.KeyDown(key = name)
|
||||||
|
}
|
||||||
|
|
||||||
|
@OptIn(ExperimentalForeignApi::class)
|
||||||
|
object LinuxPosixLyngConsole : LyngConsole {
|
||||||
|
private val stateMutex = Mutex()
|
||||||
|
private var rawModeRequested = false
|
||||||
|
private var savedAttrsBlob: ByteArray? = null
|
||||||
|
|
||||||
|
override val isSupported: Boolean
|
||||||
|
get() = isatty(STDIN_FILENO) == 1 && isatty(STDOUT_FILENO) == 1
|
||||||
|
|
||||||
|
override suspend fun isTty(): Boolean = isSupported
|
||||||
|
|
||||||
|
override suspend fun geometry(): ConsoleGeometry? = readGeometry()
|
||||||
|
|
||||||
|
override suspend fun ansiLevel(): ConsoleAnsiLevel {
|
||||||
|
val colorTerm = (getenv("COLORTERM")?.toKString() ?: "").lowercase()
|
||||||
|
val term = (getenv("TERM")?.toKString() ?: "").lowercase()
|
||||||
|
return when {
|
||||||
|
colorTerm.contains("truecolor") || colorTerm.contains("24bit") -> ConsoleAnsiLevel.TRUECOLOR
|
||||||
|
term.contains("256color") -> ConsoleAnsiLevel.ANSI256
|
||||||
|
term.isNotBlank() && term != "dumb" -> ConsoleAnsiLevel.BASIC16
|
||||||
|
else -> ConsoleAnsiLevel.NONE
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun write(text: String) {
|
||||||
|
kotlin.io.print(text)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun flush() {
|
||||||
|
fflush(null)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun events(): ConsoleEventSource {
|
||||||
|
if (!isSupported) {
|
||||||
|
return object : ConsoleEventSource {
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? = null
|
||||||
|
override suspend fun close() {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return object : ConsoleEventSource {
|
||||||
|
var closed = false
|
||||||
|
var lastGeometry: ConsoleGeometry? = null
|
||||||
|
|
||||||
|
override suspend fun nextEvent(timeoutMs: Long): ConsoleEvent? {
|
||||||
|
if (closed) return null
|
||||||
|
val started = TimeSource.Monotonic.markNow()
|
||||||
|
while (!closed) {
|
||||||
|
val g = readGeometry()
|
||||||
|
if (g != null && (lastGeometry == null || g.columns != lastGeometry?.columns || g.rows != lastGeometry?.rows)) {
|
||||||
|
lastGeometry = g
|
||||||
|
return ConsoleEvent.Resize(g.columns, g.rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
val rawRequested = stateMutex.withLock { rawModeRequested }
|
||||||
|
val pollSliceMs = if (timeoutMs <= 0L) 250L else minOf(250L, timeoutMs)
|
||||||
|
if (rawRequested) {
|
||||||
|
val ev = readKeyEvent(pollSliceMs)
|
||||||
|
if (ev != null) return ev
|
||||||
|
} else {
|
||||||
|
delay(25)
|
||||||
|
}
|
||||||
|
|
||||||
|
if (timeoutMs > 0L && started.elapsedNow() >= timeoutMs.milliseconds) {
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun close() {
|
||||||
|
closed = true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setRawMode(enabled: Boolean): Boolean {
|
||||||
|
if (!isSupported) return false
|
||||||
|
return stateMutex.withLock {
|
||||||
|
if (enabled) {
|
||||||
|
if (rawModeRequested) return@withLock false
|
||||||
|
memScoped {
|
||||||
|
val attrs = alloc<termios>()
|
||||||
|
if (tcgetattr(STDIN_FILENO, attrs.ptr) != 0) return@withLock false
|
||||||
|
|
||||||
|
val saved = ByteArray(sizeOf<termios>().toInt())
|
||||||
|
saved.usePinned { pinned ->
|
||||||
|
memcpy(pinned.addressOf(0), attrs.ptr, sizeOf<termios>().convert())
|
||||||
|
}
|
||||||
|
savedAttrsBlob = saved
|
||||||
|
|
||||||
|
attrs.c_lflag = attrs.c_lflag and ICANON.convert<UInt>().inv() and ECHO.convert<UInt>().inv()
|
||||||
|
attrs.c_iflag = attrs.c_iflag and IXON.convert<UInt>().inv() and ISTRIP.convert<UInt>().inv()
|
||||||
|
attrs.c_oflag = attrs.c_oflag and OPOST.convert<UInt>().inv()
|
||||||
|
if (tcsetattr(STDIN_FILENO, TCSANOW, attrs.ptr) != 0) return@withLock false
|
||||||
|
}
|
||||||
|
rawModeRequested = true
|
||||||
|
true
|
||||||
|
} else {
|
||||||
|
val hadRaw = rawModeRequested
|
||||||
|
rawModeRequested = false
|
||||||
|
val saved = savedAttrsBlob
|
||||||
|
if (saved != null) {
|
||||||
|
memScoped {
|
||||||
|
val attrs = alloc<termios>()
|
||||||
|
saved.usePinned { pinned ->
|
||||||
|
memcpy(attrs.ptr, pinned.addressOf(0), sizeOf<termios>().convert())
|
||||||
|
}
|
||||||
|
tcsetattr(STDIN_FILENO, TCSANOW, attrs.ptr)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
hadRaw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readGeometry(): ConsoleGeometry? = memScoped {
|
||||||
|
val ws = alloc<winsize>()
|
||||||
|
if (ioctl(STDOUT_FILENO, TIOCGWINSZ.convert(), ws.ptr) != 0) return null
|
||||||
|
val cols = ws.ws_col.toInt()
|
||||||
|
val rows = ws.ws_row.toInt()
|
||||||
|
if (cols <= 0 || rows <= 0) return null
|
||||||
|
ConsoleGeometry(columns = cols, rows = rows)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readByte(timeoutMs: Long): Int? = memScoped {
|
||||||
|
val pfd = alloc<pollfd>()
|
||||||
|
pfd.fd = STDIN_FILENO
|
||||||
|
pfd.events = POLLIN.convert()
|
||||||
|
pfd.revents = 0
|
||||||
|
val ready = poll(pfd.ptr, 1.convert(), timeoutMs.toInt())
|
||||||
|
if (ready <= 0) return null
|
||||||
|
|
||||||
|
val buf = ByteArray(1)
|
||||||
|
val count = buf.usePinned { pinned ->
|
||||||
|
read(STDIN_FILENO, pinned.addressOf(0), 1.convert())
|
||||||
|
}
|
||||||
|
if (count <= 0) return null
|
||||||
|
val b = buf[0].toInt()
|
||||||
|
if (b < 0) b + 256 else b
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun readKeyEvent(timeoutMs: Long): ConsoleEvent.KeyDown? {
|
||||||
|
val first = readByte(timeoutMs) ?: return null
|
||||||
|
return LinuxConsoleKeyDecoder.decode(first) { timeout ->
|
||||||
|
readByte(timeout)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,67 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertEquals
|
||||||
|
import kotlin.test.assertFalse
|
||||||
|
import kotlin.test.assertTrue
|
||||||
|
|
||||||
|
class LinuxPosixLyngConsoleTest {
|
||||||
|
|
||||||
|
private fun decode(vararg bytes: Int): ConsoleEvent.KeyDown {
|
||||||
|
var i = 1
|
||||||
|
return LinuxConsoleKeyDecoder.decode(bytes[0]) { _ ->
|
||||||
|
if (i >= bytes.size) null else bytes[i++]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun decodesArrowLeft() {
|
||||||
|
val ev = decode(27, '['.code, 'D'.code)
|
||||||
|
assertEquals("ArrowLeft", ev.key)
|
||||||
|
assertFalse(ev.ctrl)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun decodesArrowRightCtrlModifier() {
|
||||||
|
val ev = decode(27, '['.code, '1'.code, ';'.code, '5'.code, 'C'.code)
|
||||||
|
assertEquals("ArrowRight", ev.key)
|
||||||
|
assertTrue(ev.ctrl)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun decodesEscape() {
|
||||||
|
val ev = decode(27)
|
||||||
|
assertEquals("Escape", ev.key)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun decodesCtrlC() {
|
||||||
|
val ev = decode(3)
|
||||||
|
assertEquals("c", ev.key)
|
||||||
|
assertTrue(ev.ctrl)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun decodesUppercaseShift() {
|
||||||
|
val ev = decode('A'.code)
|
||||||
|
assertEquals("A", ev.key)
|
||||||
|
assertTrue(ev.shift)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun getNativeSystemConsole(): LyngConsole = MordantLyngConsole
|
||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun getNativeSystemConsole(): LyngConsole = MordantLyngConsole
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun consoleFlowDebug(message: String, error: Throwable?) {
|
||||||
|
// no-op on Native
|
||||||
|
}
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
actual fun getSystemConsole(): LyngConsole = getNativeSystemConsole()
|
||||||
|
|
||||||
|
internal expect fun getNativeSystemConsole(): LyngConsole
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.console
|
||||||
|
|
||||||
|
internal actual fun consoleFlowDebug(message: String, error: Throwable?) {
|
||||||
|
// no-op on wasmJs
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
group = "net.sergeych"
|
group = "net.sergeych"
|
||||||
version = "1.5.1-SNAPSHOT"
|
version = "1.5.0-RC"
|
||||||
|
|
||||||
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.bytecode
|
||||||
|
|
||||||
|
internal actual fun vmIterDebug(message: String, error: Throwable?) {
|
||||||
|
// no-op on Android
|
||||||
|
}
|
||||||
@@ -220,6 +220,7 @@ data class ParsedArgument(
|
|||||||
val list: List<Obj>,
|
val list: List<Obj>,
|
||||||
val tailBlockMode: Boolean = false,
|
val tailBlockMode: Boolean = false,
|
||||||
val named: Map<String, Obj> = emptyMap(),
|
val named: Map<String, Obj> = emptyMap(),
|
||||||
|
val explicitTypeArgs: List<TypeDecl> = emptyList(),
|
||||||
) : List<Obj> by list {
|
) : List<Obj> by list {
|
||||||
|
|
||||||
constructor(vararg values: Obj) : this(values.toList())
|
constructor(vararg values: Obj) : this(values.toList())
|
||||||
|
|||||||
@@ -33,6 +33,7 @@ class ClassInstanceFieldDeclStatement(
|
|||||||
val isMutable: Boolean,
|
val isMutable: Boolean,
|
||||||
val visibility: Visibility,
|
val visibility: Visibility,
|
||||||
val writeVisibility: Visibility?,
|
val writeVisibility: Visibility?,
|
||||||
|
val typeDecl: TypeDecl?,
|
||||||
val isAbstract: Boolean,
|
val isAbstract: Boolean,
|
||||||
val isClosed: Boolean,
|
val isClosed: Boolean,
|
||||||
val isOverride: Boolean,
|
val isOverride: Boolean,
|
||||||
|
|||||||
@@ -36,10 +36,19 @@ class BytecodeClosureScope(
|
|||||||
val desired = preferredThisType?.let { typeName ->
|
val desired = preferredThisType?.let { typeName ->
|
||||||
callScope.thisVariants.firstOrNull { it.objClass.className == typeName }
|
callScope.thisVariants.firstOrNull { it.objClass.className == typeName }
|
||||||
}
|
}
|
||||||
val primaryThis = closureScope.thisObj
|
val primaryThis = when {
|
||||||
val merged = ArrayList<Obj>(callScope.thisVariants.size + closureScope.thisVariants.size + 1)
|
callScope is ApplyScope -> callScope.thisObj
|
||||||
|
desired != null -> desired
|
||||||
|
else -> closureScope.thisObj
|
||||||
|
}
|
||||||
|
val merged = ArrayList<Obj>(callScope.thisVariants.size + closureScope.thisVariants.size + 3)
|
||||||
desired?.let { merged.add(it) }
|
desired?.let { merged.add(it) }
|
||||||
|
merged.add(callScope.thisObj)
|
||||||
merged.addAll(callScope.thisVariants)
|
merged.addAll(callScope.thisVariants)
|
||||||
|
if (callScope is ApplyScope) {
|
||||||
|
merged.add(callScope.applied.thisObj)
|
||||||
|
merged.addAll(callScope.applied.thisVariants)
|
||||||
|
}
|
||||||
merged.addAll(closureScope.thisVariants)
|
merged.addAll(closureScope.thisVariants)
|
||||||
setThisVariants(primaryThis, merged)
|
setThisVariants(primaryThis, merged)
|
||||||
this.currentClassCtx = closureScope.currentClassCtx ?: callScope.currentClassCtx
|
this.currentClassCtx = closureScope.currentClassCtx ?: callScope.currentClassCtx
|
||||||
@@ -47,10 +56,20 @@ class BytecodeClosureScope(
|
|||||||
}
|
}
|
||||||
|
|
||||||
class ApplyScope(val callScope: Scope, val applied: Scope) :
|
class ApplyScope(val callScope: Scope, val applied: Scope) :
|
||||||
Scope(callScope, thisObj = applied.thisObj) {
|
Scope(applied, callScope.args, callScope.pos, callScope.thisObj) {
|
||||||
|
|
||||||
|
init {
|
||||||
|
// Merge applied receiver variants with the caller variants so qualified this@Type
|
||||||
|
// can see both the applied receiver and outer receivers.
|
||||||
|
val merged = ArrayList<Obj>(applied.thisVariants.size + callScope.thisVariants.size + 1)
|
||||||
|
merged.addAll(applied.thisVariants)
|
||||||
|
merged.addAll(callScope.thisVariants)
|
||||||
|
setThisVariants(callScope.thisObj, merged)
|
||||||
|
this.currentClassCtx = applied.currentClassCtx ?: callScope.currentClassCtx
|
||||||
|
}
|
||||||
|
|
||||||
override fun get(name: String): ObjRecord? {
|
override fun get(name: String): ObjRecord? {
|
||||||
return applied.get(name) ?: super.get(name)
|
return applied.get(name) ?: callScope.get(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun applyClosure(closure: Scope, preferredThisType: String?): Scope {
|
override fun applyClosure(closure: Scope, preferredThisType: String?): Scope {
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -56,10 +56,29 @@ class FrameSlotRef(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val resolved = read()
|
||||||
|
if (resolved === this) {
|
||||||
|
scope.raiseNotImplemented("call on unresolved frame slot")
|
||||||
|
}
|
||||||
|
return resolved.callOn(scope)
|
||||||
|
}
|
||||||
|
|
||||||
internal fun refersTo(frame: FrameAccess, slot: Int): Boolean {
|
internal fun refersTo(frame: FrameAccess, slot: Int): Boolean {
|
||||||
return this.frame === frame && this.slot == slot
|
return this.frame === frame && this.slot == slot
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal fun peekValue(): Obj? {
|
||||||
|
val bytecodeFrame = frame as? net.sergeych.lyng.bytecode.BytecodeFrame ?: return read()
|
||||||
|
val raw = bytecodeFrame.getRawObj(slot) ?: return null
|
||||||
|
if (raw is FrameSlotRef && raw.refersTo(bytecodeFrame, slot)) return null
|
||||||
|
return when (raw) {
|
||||||
|
is FrameSlotRef -> raw.peekValue()
|
||||||
|
is RecordSlotRef -> raw.peekValue()
|
||||||
|
else -> raw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun write(value: Obj) {
|
fun write(value: Obj) {
|
||||||
when (value) {
|
when (value) {
|
||||||
is ObjInt -> frame.setInt(slot, value.value)
|
is ObjInt -> frame.setInt(slot, value.value)
|
||||||
@@ -70,6 +89,62 @@ class FrameSlotRef(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ScopeSlotRef(
|
||||||
|
private val scope: Scope,
|
||||||
|
private val slot: Int,
|
||||||
|
private val name: String? = null,
|
||||||
|
) : net.sergeych.lyng.obj.Obj() {
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
val resolvedOther = when (other) {
|
||||||
|
is FrameSlotRef -> other.read()
|
||||||
|
is RecordSlotRef -> other.read()
|
||||||
|
is ScopeSlotRef -> other.read()
|
||||||
|
else -> other
|
||||||
|
}
|
||||||
|
return read().compareTo(scope, resolvedOther)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun read(): Obj {
|
||||||
|
val record = scope.getSlotRecord(slot)
|
||||||
|
val direct = record.value
|
||||||
|
if (direct is FrameSlotRef) return direct.read()
|
||||||
|
if (direct is RecordSlotRef) return direct.read()
|
||||||
|
if (direct is ScopeSlotRef) return direct.read()
|
||||||
|
if (direct !== ObjUnset) {
|
||||||
|
return direct
|
||||||
|
}
|
||||||
|
if (name == null) return record.value
|
||||||
|
val resolved = scope.get(name) ?: return record.value
|
||||||
|
if (resolved.value !== ObjUnset) {
|
||||||
|
scope.updateSlotFor(name, resolved)
|
||||||
|
}
|
||||||
|
return resolved.value
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun peekValue(): Obj? {
|
||||||
|
val record = scope.getSlotRecord(slot)
|
||||||
|
val direct = record.value
|
||||||
|
return when (direct) {
|
||||||
|
is FrameSlotRef -> direct.peekValue()
|
||||||
|
is RecordSlotRef -> direct.peekValue()
|
||||||
|
is ScopeSlotRef -> direct.peekValue()
|
||||||
|
else -> direct
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun write(value: Obj) {
|
||||||
|
scope.setSlotValue(slot, value)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val resolved = read()
|
||||||
|
if (resolved === this) {
|
||||||
|
scope.raiseNotImplemented("call on unresolved scope slot")
|
||||||
|
}
|
||||||
|
return resolved.callOn(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class RecordSlotRef(
|
class RecordSlotRef(
|
||||||
private val record: ObjRecord,
|
private val record: ObjRecord,
|
||||||
) : net.sergeych.lyng.obj.Obj() {
|
) : net.sergeych.lyng.obj.Obj() {
|
||||||
@@ -77,6 +152,7 @@ class RecordSlotRef(
|
|||||||
val resolvedOther = when (other) {
|
val resolvedOther = when (other) {
|
||||||
is FrameSlotRef -> other.read()
|
is FrameSlotRef -> other.read()
|
||||||
is RecordSlotRef -> other.read()
|
is RecordSlotRef -> other.read()
|
||||||
|
is ScopeSlotRef -> other.read()
|
||||||
else -> other
|
else -> other
|
||||||
}
|
}
|
||||||
return read().compareTo(scope, resolvedOther)
|
return read().compareTo(scope, resolvedOther)
|
||||||
@@ -84,10 +160,37 @@ class RecordSlotRef(
|
|||||||
|
|
||||||
fun read(): Obj {
|
fun read(): Obj {
|
||||||
val direct = record.value
|
val direct = record.value
|
||||||
return if (direct is FrameSlotRef) direct.read() else direct
|
return when (direct) {
|
||||||
|
is FrameSlotRef -> direct.read()
|
||||||
|
is ScopeSlotRef -> direct.read()
|
||||||
|
else -> direct
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val resolved = read()
|
||||||
|
if (resolved === this) {
|
||||||
|
scope.raiseNotImplemented("call on unresolved record slot")
|
||||||
|
}
|
||||||
|
return resolved.callOn(scope)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun peekValue(): Obj? {
|
||||||
|
val direct = record.value
|
||||||
|
return when (direct) {
|
||||||
|
is FrameSlotRef -> direct.peekValue()
|
||||||
|
is RecordSlotRef -> direct.peekValue()
|
||||||
|
is ScopeSlotRef -> direct.peekValue()
|
||||||
|
else -> direct
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun write(value: Obj) {
|
fun write(value: Obj) {
|
||||||
|
val direct = record.value
|
||||||
|
if (direct is ScopeSlotRef) {
|
||||||
|
direct.write(value)
|
||||||
|
} else {
|
||||||
record.value = value
|
record.value = value
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -44,11 +44,28 @@ class ModuleScope(
|
|||||||
|
|
||||||
internal fun ensureModuleFrame(fn: CmdFunction): BytecodeFrame {
|
internal fun ensureModuleFrame(fn: CmdFunction): BytecodeFrame {
|
||||||
val current = moduleFrame
|
val current = moduleFrame
|
||||||
val frame = if (current == null || moduleFrameLocalCount != fn.localCount) {
|
val frame = if (current == null) {
|
||||||
BytecodeFrame(fn.localCount, 0).also {
|
BytecodeFrame(fn.localCount, 0).also {
|
||||||
moduleFrame = it
|
moduleFrame = it
|
||||||
moduleFrameLocalCount = fn.localCount
|
moduleFrameLocalCount = fn.localCount
|
||||||
}
|
}
|
||||||
|
} else if (fn.localCount > moduleFrameLocalCount) {
|
||||||
|
val next = BytecodeFrame(fn.localCount, 0)
|
||||||
|
current.copyTo(next)
|
||||||
|
moduleFrame = next
|
||||||
|
moduleFrameLocalCount = fn.localCount
|
||||||
|
// Retarget frame-based locals to the new frame instance.
|
||||||
|
val localNames = fn.localSlotNames
|
||||||
|
for (i in localNames.indices) {
|
||||||
|
val name = localNames[i] ?: continue
|
||||||
|
val record = objects[name] ?: localBindings[name] ?: continue
|
||||||
|
val value = record.value
|
||||||
|
if (value is FrameSlotRef && value.refersTo(current, i)) {
|
||||||
|
record.value = FrameSlotRef(next, i)
|
||||||
|
updateSlotFor(name, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
next
|
||||||
} else {
|
} else {
|
||||||
current
|
current
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -306,17 +306,41 @@ private class Parser(fromPos: Pos) {
|
|||||||
'\'' -> {
|
'\'' -> {
|
||||||
val start = pos.toPos()
|
val start = pos.toPos()
|
||||||
var value = currentChar
|
var value = currentChar
|
||||||
pos.advance()
|
|
||||||
if (currentChar == '\\') {
|
if (currentChar == '\\') {
|
||||||
value = currentChar
|
|
||||||
pos.advance()
|
pos.advance()
|
||||||
value = when (value) {
|
if (pos.end) throw ScriptError(start, "unterminated character literal")
|
||||||
'n' -> '\n'
|
value = when (currentChar) {
|
||||||
'r' -> '\r'
|
'n' -> {
|
||||||
't' -> '\t'
|
pos.advance()
|
||||||
'\'', '\\' -> value
|
'\n'
|
||||||
else -> throw ScriptError(currentPos, "unsupported escape character: $value")
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
'r' -> {
|
||||||
|
pos.advance()
|
||||||
|
'\r'
|
||||||
|
}
|
||||||
|
|
||||||
|
't' -> {
|
||||||
|
pos.advance()
|
||||||
|
'\t'
|
||||||
|
}
|
||||||
|
|
||||||
|
'\'' -> {
|
||||||
|
pos.advance()
|
||||||
|
'\''
|
||||||
|
}
|
||||||
|
|
||||||
|
'\\' -> {
|
||||||
|
pos.advance()
|
||||||
|
'\\'
|
||||||
|
}
|
||||||
|
|
||||||
|
'u' -> loadUnicodeEscape(start)
|
||||||
|
|
||||||
|
else -> throw ScriptError(currentPos, "unsupported escape character: $currentChar")
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
pos.advance()
|
||||||
}
|
}
|
||||||
if (currentChar != '\'') throw ScriptError(currentPos, "expected end of character literal: '")
|
if (currentChar != '\'') throw ScriptError(currentPos, "expected end of character literal: '")
|
||||||
pos.advance()
|
pos.advance()
|
||||||
@@ -494,6 +518,10 @@ private class Parser(fromPos: Pos) {
|
|||||||
sb.append('\\'); pos.advance()
|
sb.append('\\'); pos.advance()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
'u' -> {
|
||||||
|
sb.append(loadUnicodeEscape(start))
|
||||||
|
}
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
sb.append('\\').append(currentChar)
|
sb.append('\\').append(currentChar)
|
||||||
pos.advance()
|
pos.advance()
|
||||||
@@ -520,6 +548,23 @@ private class Parser(fromPos: Pos) {
|
|||||||
return Token(result, start, Token.Type.STRING)
|
return Token(result, start, Token.Type.STRING)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun loadUnicodeEscape(start: Pos): Char {
|
||||||
|
// Called when currentChar points to 'u' right after a backslash.
|
||||||
|
if (currentChar != 'u') throw ScriptError(currentPos, "expected unicode escape marker: u")
|
||||||
|
pos.advance() ?: throw ScriptError(start, "unterminated unicode escape")
|
||||||
|
|
||||||
|
var code = 0
|
||||||
|
repeat(4) {
|
||||||
|
val ch = currentChar
|
||||||
|
if (ch !in hexDigits) {
|
||||||
|
throw ScriptError(currentPos, "invalid unicode escape sequence, expected 4 hex digits")
|
||||||
|
}
|
||||||
|
code = (code shl 4) + ch.digitToInt(16)
|
||||||
|
pos.advance()
|
||||||
|
}
|
||||||
|
return code.toChar()
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Load characters from the set until it reaches EOF or invalid character found.
|
* Load characters from the set until it reaches EOF or invalid character found.
|
||||||
* stop at EOF on character filtered by [isValidChar].
|
* stop at EOF on character filtered by [isValidChar].
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,7 +19,8 @@ package net.sergeych.lyng
|
|||||||
|
|
||||||
data class Pos(val source: Source, val line: Int, val column: Int) {
|
data class Pos(val source: Source, val line: Int, val column: Int) {
|
||||||
override fun toString(): String {
|
override fun toString(): String {
|
||||||
return "${source.fileName}:${line+1}:${column}"
|
val col = if (column >= 0) column + 1 else column
|
||||||
|
return "${source.fileName}:${line+1}:$col"
|
||||||
}
|
}
|
||||||
|
|
||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
|
|||||||
@@ -471,6 +471,62 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun resolvedRecordValueOrNull(record: ObjRecord): Obj? {
|
||||||
|
return when (val raw = record.value) {
|
||||||
|
is FrameSlotRef -> raw.read()
|
||||||
|
is RecordSlotRef -> raw.read()
|
||||||
|
else -> raw
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun declaredTypeForValueInThisScope(value: Obj): TypeDecl? {
|
||||||
|
// Prefer direct bindings first.
|
||||||
|
for (record in objects.values) {
|
||||||
|
val decl = record.typeDecl ?: continue
|
||||||
|
if (resolvedRecordValueOrNull(record) === value) return decl
|
||||||
|
}
|
||||||
|
for ((_, record) in localBindings) {
|
||||||
|
val decl = record.typeDecl ?: continue
|
||||||
|
if (resolvedRecordValueOrNull(record) === value) return decl
|
||||||
|
}
|
||||||
|
// Then slots (for frame-first locals).
|
||||||
|
var i = 0
|
||||||
|
while (i < slots.size) {
|
||||||
|
val record = slots[i]
|
||||||
|
val decl = record.typeDecl
|
||||||
|
if (decl != null && resolvedRecordValueOrNull(record) === value) return decl
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun declaredCollectionElementTypeForValue(value: Obj, rawName: String): TypeDecl? {
|
||||||
|
var s: Scope? = this
|
||||||
|
var hops = 0
|
||||||
|
while (s != null && hops++ < 1024) {
|
||||||
|
val decl = s.declaredTypeForValueInThisScope(value)
|
||||||
|
if (decl is TypeDecl.Generic && decl.name.substringAfterLast('.') == rawName) {
|
||||||
|
return decl.args.firstOrNull()
|
||||||
|
}
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Best-effort lookup of the declared Set element type for a runtime set instance.
|
||||||
|
* Returns null when type info is unavailable.
|
||||||
|
*/
|
||||||
|
fun declaredSetElementTypeForValue(value: Obj): TypeDecl? =
|
||||||
|
declaredCollectionElementTypeForValue(value, "Set")
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Best-effort lookup of the declared List element type for a runtime list instance.
|
||||||
|
* Returns null when type info is unavailable.
|
||||||
|
*/
|
||||||
|
fun declaredListElementTypeForValue(value: Obj): TypeDecl? =
|
||||||
|
declaredCollectionElementTypeForValue(value, "List")
|
||||||
|
|
||||||
internal fun applySlotPlanReset(plan: Map<String, Int>, records: Map<String, ObjRecord>) {
|
internal fun applySlotPlanReset(plan: Map<String, Int>, records: Map<String, ObjRecord>) {
|
||||||
if (plan.isEmpty()) return
|
if (plan.isEmpty()) return
|
||||||
slots.clear()
|
slots.clear()
|
||||||
@@ -635,10 +691,16 @@ open class Scope(
|
|||||||
objects[name]?.let {
|
objects[name]?.let {
|
||||||
if( !it.isMutable )
|
if( !it.isMutable )
|
||||||
raiseIllegalAssignment("symbol is readonly: $name")
|
raiseIllegalAssignment("symbol is readonly: $name")
|
||||||
it.value = value
|
when (val current = it.value) {
|
||||||
|
is FrameSlotRef -> current.write(value)
|
||||||
|
is RecordSlotRef -> current.write(value)
|
||||||
|
else -> it.value = value
|
||||||
|
}
|
||||||
// keep local binding index consistent within the frame
|
// keep local binding index consistent within the frame
|
||||||
localBindings[name] = it
|
localBindings[name] = it
|
||||||
bumpClassLayoutIfNeeded(name, value, recordType)
|
bumpClassLayoutIfNeeded(name, value, recordType)
|
||||||
|
updateSlotFor(name, it)
|
||||||
|
syncModuleFrameSlot(name, value)
|
||||||
it
|
it
|
||||||
} ?: addItem(name, true, value, visibility, writeVisibility, recordType, isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride)
|
} ?: addItem(name, true, value, visibility, writeVisibility, recordType, isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride)
|
||||||
|
|
||||||
@@ -705,6 +767,7 @@ open class Scope(
|
|||||||
slots[idx] = rec
|
slots[idx] = rec
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
syncModuleFrameSlot(name, value)
|
||||||
return rec
|
return rec
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -752,7 +815,48 @@ open class Scope(
|
|||||||
|
|
||||||
// --- removed doc-aware overloads to keep runtime lean ---
|
// --- removed doc-aware overloads to keep runtime lean ---
|
||||||
|
|
||||||
fun addConst(name: String, value: Obj) = addItem(name, false, value)
|
fun addConst(name: String, value: Obj): ObjRecord {
|
||||||
|
val existing = objects[name]
|
||||||
|
if (existing != null) {
|
||||||
|
when (val current = existing.value) {
|
||||||
|
is FrameSlotRef -> current.write(value)
|
||||||
|
is RecordSlotRef -> current.write(value)
|
||||||
|
else -> existing.value = value
|
||||||
|
}
|
||||||
|
bumpClassLayoutIfNeeded(name, value, existing.type)
|
||||||
|
updateSlotFor(name, existing)
|
||||||
|
syncModuleFrameSlot(name, value)
|
||||||
|
return existing
|
||||||
|
}
|
||||||
|
val slotIndex = getSlotIndexOf(name)
|
||||||
|
if (slotIndex != null) {
|
||||||
|
val record = getSlotRecord(slotIndex)
|
||||||
|
when (val current = record.value) {
|
||||||
|
is FrameSlotRef -> current.write(value)
|
||||||
|
is RecordSlotRef -> current.write(value)
|
||||||
|
else -> record.value = value
|
||||||
|
}
|
||||||
|
bumpClassLayoutIfNeeded(name, value, record.type)
|
||||||
|
updateSlotFor(name, record)
|
||||||
|
syncModuleFrameSlot(name, value)
|
||||||
|
return record
|
||||||
|
}
|
||||||
|
val record = addItem(name, false, value)
|
||||||
|
syncModuleFrameSlot(name, value)
|
||||||
|
return record
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun syncModuleFrameSlot(name: String, value: Obj) {
|
||||||
|
val module = this as? ModuleScope ?: return
|
||||||
|
val frame = module.moduleFrame ?: return
|
||||||
|
val localNames = module.moduleFrameLocalSlotNames
|
||||||
|
if (localNames.isEmpty()) return
|
||||||
|
for (i in localNames.indices) {
|
||||||
|
if (localNames[i] == name) {
|
||||||
|
frame.setObj(i, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
suspend fun eval(code: String): Obj =
|
suspend fun eval(code: String): Obj =
|
||||||
|
|||||||
@@ -20,15 +20,19 @@ package net.sergeych.lyng
|
|||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.yield
|
import kotlinx.coroutines.yield
|
||||||
import net.sergeych.lyng.Script.Companion.defaultImportManager
|
import net.sergeych.lyng.Script.Companion.defaultImportManager
|
||||||
|
import net.sergeych.lyng.bridge.bind
|
||||||
|
import net.sergeych.lyng.bridge.bindObject
|
||||||
import net.sergeych.lyng.bytecode.CmdFunction
|
import net.sergeych.lyng.bytecode.CmdFunction
|
||||||
import net.sergeych.lyng.bytecode.CmdVm
|
import net.sergeych.lyng.bytecode.CmdVm
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
import net.sergeych.lyng.pacman.ImportManager
|
import net.sergeych.lyng.pacman.ImportManager
|
||||||
|
import net.sergeych.lyng.stdlib_included.observableLyng
|
||||||
import net.sergeych.lyng.stdlib_included.rootLyng
|
import net.sergeych.lyng.stdlib_included.rootLyng
|
||||||
import net.sergeych.lynon.ObjLynonClass
|
import net.sergeych.lynon.ObjLynonClass
|
||||||
import net.sergeych.mp_tools.globalDefer
|
import net.sergeych.mp_tools.globalDefer
|
||||||
import kotlin.math.*
|
import kotlin.math.*
|
||||||
|
import kotlin.random.Random as KRandom
|
||||||
|
|
||||||
@Suppress("TYPE_INTERSECTION_AS_REIFIED_WARNING")
|
@Suppress("TYPE_INTERSECTION_AS_REIFIED_WARNING")
|
||||||
class Script(
|
class Script(
|
||||||
@@ -42,13 +46,12 @@ class Script(
|
|||||||
// private val catchReturn: Boolean = false,
|
// private val catchReturn: Boolean = false,
|
||||||
) : Statement() {
|
) : Statement() {
|
||||||
fun statements(): List<Statement> = statements
|
fun statements(): List<Statement> = statements
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
scope.pos = pos
|
scope.pos = pos
|
||||||
val execScope = resolveModuleScope(scope) ?: scope
|
val execScope = resolveModuleScope(scope) ?: scope
|
||||||
val isModuleScope = execScope is ModuleScope
|
val isModuleScope = execScope is ModuleScope
|
||||||
val shouldSeedModule = isModuleScope || execScope.thisObj === ObjVoid
|
val shouldSeedModule = isModuleScope || execScope.thisObj === ObjVoid
|
||||||
val moduleTarget = execScope
|
val moduleTarget = (execScope as? ModuleScope) ?: execScope.parent as? ModuleScope ?: execScope
|
||||||
if (shouldSeedModule) {
|
if (shouldSeedModule) {
|
||||||
seedModuleSlots(moduleTarget, scope)
|
seedModuleSlots(moduleTarget, scope)
|
||||||
}
|
}
|
||||||
@@ -56,9 +59,15 @@ class Script(
|
|||||||
if (execScope is ModuleScope) {
|
if (execScope is ModuleScope) {
|
||||||
execScope.ensureModuleFrame(fn)
|
execScope.ensureModuleFrame(fn)
|
||||||
}
|
}
|
||||||
return CmdVm().execute(fn, execScope, scope.args) { frame, _ ->
|
var execFrame: net.sergeych.lyng.bytecode.CmdFrame? = null
|
||||||
|
val result = CmdVm().execute(fn, execScope, scope.args) { frame, _ ->
|
||||||
|
execFrame = frame
|
||||||
seedModuleLocals(frame, moduleTarget, scope)
|
seedModuleLocals(frame, moduleTarget, scope)
|
||||||
}
|
}
|
||||||
|
if (execScope !is ModuleScope) {
|
||||||
|
execFrame?.let { syncFrameLocalsToScope(it, execScope) }
|
||||||
|
}
|
||||||
|
return result
|
||||||
}
|
}
|
||||||
if (statements.isNotEmpty()) {
|
if (statements.isNotEmpty()) {
|
||||||
scope.raiseIllegalState("bytecode-only execution is required; missing module bytecode")
|
scope.raiseIllegalState("bytecode-only execution is required; missing module bytecode")
|
||||||
@@ -69,6 +78,13 @@ class Script(
|
|||||||
private suspend fun seedModuleSlots(scope: Scope, seedScope: Scope) {
|
private suspend fun seedModuleSlots(scope: Scope, seedScope: Scope) {
|
||||||
if (importBindings.isEmpty() && importedModules.isEmpty()) return
|
if (importBindings.isEmpty() && importedModules.isEmpty()) return
|
||||||
seedImportBindings(scope, seedScope)
|
seedImportBindings(scope, seedScope)
|
||||||
|
if (moduleSlotPlan.isNotEmpty()) {
|
||||||
|
scope.applySlotPlan(moduleSlotPlan)
|
||||||
|
for (name in moduleSlotPlan.keys) {
|
||||||
|
val record = scope.objects[name] ?: scope.localBindings[name] ?: continue
|
||||||
|
scope.updateSlotFor(name, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun seedModuleLocals(
|
private suspend fun seedModuleLocals(
|
||||||
@@ -87,12 +103,43 @@ class Script(
|
|||||||
val value = if (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property) {
|
val value = if (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property) {
|
||||||
scope.resolve(record, name)
|
scope.resolve(record, name)
|
||||||
} else {
|
} else {
|
||||||
record.value
|
val raw = record.value
|
||||||
|
when (raw) {
|
||||||
|
is FrameSlotRef -> {
|
||||||
|
if (raw.refersTo(frame.frame, i)) {
|
||||||
|
raw.peekValue() ?: continue
|
||||||
|
} else if (seedScope !is ModuleScope) {
|
||||||
|
raw
|
||||||
|
} else {
|
||||||
|
raw.read()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is RecordSlotRef -> {
|
||||||
|
if (seedScope !is ModuleScope) raw else raw.read()
|
||||||
|
}
|
||||||
|
else -> raw
|
||||||
|
}
|
||||||
}
|
}
|
||||||
frame.setObjUnchecked(base + i, value)
|
frame.setObjUnchecked(base + i, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun syncFrameLocalsToScope(frame: net.sergeych.lyng.bytecode.CmdFrame, scope: Scope) {
|
||||||
|
val localNames = frame.fn.localSlotNames
|
||||||
|
if (localNames.isEmpty()) return
|
||||||
|
for (i in localNames.indices) {
|
||||||
|
val name = localNames[i] ?: continue
|
||||||
|
val record = scope.getLocalRecordDirect(name) ?: scope.localBindings[name] ?: scope.objects[name] ?: continue
|
||||||
|
val value = frame.readLocalObj(i)
|
||||||
|
when (val current = record.value) {
|
||||||
|
is FrameSlotRef -> current.write(value)
|
||||||
|
is RecordSlotRef -> current.write(value)
|
||||||
|
else -> record.value = value
|
||||||
|
}
|
||||||
|
scope.updateSlotFor(name, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private suspend fun seedImportBindings(scope: Scope, seedScope: Scope) {
|
private suspend fun seedImportBindings(scope: Scope, seedScope: Scope) {
|
||||||
val provider = scope.currentImportProvider
|
val provider = scope.currentImportProvider
|
||||||
val importedModules = LinkedHashSet<ModuleScope>()
|
val importedModules = LinkedHashSet<ModuleScope>()
|
||||||
@@ -102,6 +149,9 @@ class Script(
|
|||||||
if (scope is ModuleScope) {
|
if (scope is ModuleScope) {
|
||||||
scope.importedModules = importedModules.toList()
|
scope.importedModules = importedModules.toList()
|
||||||
}
|
}
|
||||||
|
for (module in importedModules) {
|
||||||
|
module.importInto(scope, null)
|
||||||
|
}
|
||||||
for ((name, binding) in importBindings) {
|
for ((name, binding) in importBindings) {
|
||||||
val record = when (val source = binding.source) {
|
val record = when (val source = binding.source) {
|
||||||
is ImportBindingSource.Module -> {
|
is ImportBindingSource.Module -> {
|
||||||
@@ -476,9 +526,12 @@ class Script(
|
|||||||
addConst("Bool", ObjBool.type)
|
addConst("Bool", ObjBool.type)
|
||||||
addConst("Char", ObjChar.type)
|
addConst("Char", ObjChar.type)
|
||||||
addConst("List", ObjList.type)
|
addConst("List", ObjList.type)
|
||||||
|
addConst("ImmutableList", ObjImmutableList.type)
|
||||||
addConst("Set", ObjSet.type)
|
addConst("Set", ObjSet.type)
|
||||||
|
addConst("ImmutableSet", ObjImmutableSet.type)
|
||||||
addConst("Range", ObjRange.type)
|
addConst("Range", ObjRange.type)
|
||||||
addConst("Map", ObjMap.type)
|
addConst("Map", ObjMap.type)
|
||||||
|
addConst("ImmutableMap", ObjImmutableMap.type)
|
||||||
addConst("MapEntry", ObjMapEntry.type)
|
addConst("MapEntry", ObjMapEntry.type)
|
||||||
@Suppress("RemoveRedundantQualifierName")
|
@Suppress("RemoveRedundantQualifierName")
|
||||||
addConst("Callable", Statement.type)
|
addConst("Callable", Statement.type)
|
||||||
@@ -538,11 +591,110 @@ class Script(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun seededRandomFromThis(scope: Scope, thisObj: Obj): KRandom {
|
||||||
|
val instance = thisObj as? ObjInstance
|
||||||
|
?: scope.raiseIllegalState("SeededRandom method requires instance receiver")
|
||||||
|
val stored = instance.kotlinInstanceData
|
||||||
|
if (stored is KRandom) return stored
|
||||||
|
return KRandom.Default.also { instance.kotlinInstanceData = it }
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun sampleRangeValue(scope: Scope, random: KRandom, range: ObjRange): Obj {
|
||||||
|
if (range.start == null || range.start.isNull || range.end == null || range.end.isNull) {
|
||||||
|
scope.raiseIllegalArgument("Random.next(range) requires a finite range")
|
||||||
|
}
|
||||||
|
val start = range.start
|
||||||
|
val end = range.end
|
||||||
|
|
||||||
|
// Real ranges without explicit step are sampled continuously.
|
||||||
|
if (!range.hasExplicitStep &&
|
||||||
|
start is Numeric &&
|
||||||
|
end is Numeric &&
|
||||||
|
(start !is ObjInt || end !is ObjInt)
|
||||||
|
) {
|
||||||
|
val from = start.doubleValue
|
||||||
|
val to = end.doubleValue
|
||||||
|
if (from > to || (!range.isEndInclusive && from == to)) {
|
||||||
|
scope.raiseIllegalArgument("Random.next(range) got an empty numeric range")
|
||||||
|
}
|
||||||
|
if (from == to) return ObjReal(from)
|
||||||
|
val upperExclusive = if (range.isEndInclusive) to.nextUp() else to
|
||||||
|
if (upperExclusive <= from) {
|
||||||
|
scope.raiseIllegalArgument("Random.next(range) got an empty numeric range")
|
||||||
|
}
|
||||||
|
return ObjReal(random.nextDouble(from, upperExclusive))
|
||||||
|
}
|
||||||
|
|
||||||
|
// Discrete sampling for stepped ranges and integer/char ranges.
|
||||||
|
var picked: Obj? = null
|
||||||
|
var count = 0L
|
||||||
|
range.enumerate(scope) { value ->
|
||||||
|
count += 1
|
||||||
|
if (random.nextLong(count) == 0L) {
|
||||||
|
picked = value
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
if (count <= 0L || picked == null) {
|
||||||
|
scope.raiseIllegalArgument("Random.next(range) got an empty range")
|
||||||
|
}
|
||||||
|
return picked
|
||||||
|
}
|
||||||
|
|
||||||
val defaultImportManager: ImportManager by lazy {
|
val defaultImportManager: ImportManager by lazy {
|
||||||
ImportManager(rootScope, SecurityManager.allowAll).apply {
|
ImportManager(rootScope, SecurityManager.allowAll).apply {
|
||||||
addPackage("lyng.stdlib") { module ->
|
addPackage("lyng.stdlib") { module ->
|
||||||
module.eval(Source("lyng.stdlib", rootLyng))
|
module.eval(Source("lyng.stdlib", rootLyng))
|
||||||
ObjKotlinIterator.bindTo(module.requireClass("KotlinIterator"))
|
ObjKotlinIterator.bindTo(module.requireClass("KotlinIterator"))
|
||||||
|
val seededRandomClass = module.requireClass("SeededRandom")
|
||||||
|
module.bind("SeededRandom") {
|
||||||
|
init { data = KRandom.Default }
|
||||||
|
addFun("nextInt") {
|
||||||
|
val rnd = seededRandomFromThis(requireScope(), thisObj)
|
||||||
|
ObjInt.of(rnd.nextInt().toLong())
|
||||||
|
}
|
||||||
|
addFun("nextFloat") {
|
||||||
|
val rnd = seededRandomFromThis(requireScope(), thisObj)
|
||||||
|
ObjReal(rnd.nextDouble())
|
||||||
|
}
|
||||||
|
addFun("next") {
|
||||||
|
val rnd = seededRandomFromThis(requireScope(), thisObj)
|
||||||
|
val range = requiredArg<ObjRange>(0)
|
||||||
|
sampleRangeValue(requireScope(), rnd, range)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
module.bindObject("Random") {
|
||||||
|
addFun("nextInt") {
|
||||||
|
ObjInt.of(KRandom.Default.nextInt().toLong())
|
||||||
|
}
|
||||||
|
addFun("nextFloat") {
|
||||||
|
ObjReal(KRandom.Default.nextDouble())
|
||||||
|
}
|
||||||
|
addFun("next") {
|
||||||
|
val range = requiredArg<ObjRange>(0)
|
||||||
|
sampleRangeValue(requireScope(), KRandom.Default, range)
|
||||||
|
}
|
||||||
|
addFun("seeded") {
|
||||||
|
val seed = requiredArg<ObjInt>(0).value.toInt()
|
||||||
|
val instance = call(seededRandomClass) as? ObjInstance
|
||||||
|
?: requireScope().raiseIllegalState("SeededRandom() did not return an object instance")
|
||||||
|
instance.kotlinInstanceData = KRandom(seed)
|
||||||
|
instance
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
addPackage("lyng.observable") { module ->
|
||||||
|
module.addConst("Observable", ObjObservable)
|
||||||
|
module.addConst("Subscription", ObjSubscription.type)
|
||||||
|
module.addConst("ListChange", ObjListChange.type)
|
||||||
|
module.addConst("ListSet", ObjListSetChange.type)
|
||||||
|
module.addConst("ListInsert", ObjListInsertChange.type)
|
||||||
|
module.addConst("ListRemove", ObjListRemoveChange.type)
|
||||||
|
module.addConst("ListClear", ObjListClearChange.type)
|
||||||
|
module.addConst("ListReorder", ObjListReorderChange.type)
|
||||||
|
module.addConst("ObservableList", ObjObservableList.type)
|
||||||
|
module.addConst("ChangeRejectionException", ObjChangeRejectionExceptionClass)
|
||||||
|
module.eval(Source("lyng.observable", observableLyng))
|
||||||
}
|
}
|
||||||
addPackage("lyng.buffer") {
|
addPackage("lyng.buffer") {
|
||||||
it.addConstDoc(
|
it.addConstDoc(
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2026 Sergey S. Chernov
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -12,6 +12,7 @@
|
|||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
* See the License for the specific language governing permissions and
|
* See the License for the specific language governing permissions and
|
||||||
* limitations under the License.
|
* limitations under the License.
|
||||||
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
@@ -55,6 +56,15 @@ class WhenIsCondition(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class WhenNullableCondition(
|
||||||
|
val negated: Boolean,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : WhenCondition(ExpressionStatement(net.sergeych.lyng.obj.ConstRef(net.sergeych.lyng.obj.ObjVoid.asReadonly), pos), pos) {
|
||||||
|
override suspend fun matches(scope: Scope, value: Obj): Boolean {
|
||||||
|
return bytecodeOnly(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
data class WhenCase(val conditions: List<WhenCondition>, val block: Statement)
|
data class WhenCase(val conditions: List<WhenCondition>, val block: Statement)
|
||||||
|
|
||||||
class WhenStatement(
|
class WhenStatement(
|
||||||
|
|||||||
@@ -51,8 +51,9 @@ interface BridgeInstanceContext {
|
|||||||
* Use [LyngClassBridge.bind] to obtain a binder and register implementations.
|
* Use [LyngClassBridge.bind] to obtain a binder and register implementations.
|
||||||
* Bindings must happen before the first instance of the class is created.
|
* Bindings must happen before the first instance of the class is created.
|
||||||
*
|
*
|
||||||
* Important: members you bind here must be declared as `extern` in Lyng so the
|
* Important: members you bind here must be extern in Lyng (explicitly, or
|
||||||
* compiler emits the ABI slots that Kotlin bindings attach to.
|
* implicitly by being inside `extern class` / `extern object`) so the compiler
|
||||||
|
* emits the ABI slots that Kotlin bindings attach to.
|
||||||
*/
|
*/
|
||||||
interface ClassBridgeBinder {
|
interface ClassBridgeBinder {
|
||||||
/** Arbitrary Kotlin-side data attached to the class. */
|
/** Arbitrary Kotlin-side data attached to the class. */
|
||||||
@@ -60,12 +61,54 @@ interface ClassBridgeBinder {
|
|||||||
/** Register an initialization hook that runs for each instance. */
|
/** Register an initialization hook that runs for each instance. */
|
||||||
fun init(block: suspend BridgeInstanceContext.(ScopeFacade) -> Unit)
|
fun init(block: suspend BridgeInstanceContext.(ScopeFacade) -> Unit)
|
||||||
/** Register an initialization hook with direct access to the instance. */
|
/** Register an initialization hook with direct access to the instance. */
|
||||||
|
fun initWithInstance(block: suspend ScopeFacade.() -> Unit)
|
||||||
|
/**
|
||||||
|
* Legacy initWithInstance form.
|
||||||
|
* Prefer [initWithInstance] with [ScopeFacade] receiver and use [ScopeFacade.thisObj].
|
||||||
|
*/
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use initWithInstance { ... } with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith("initWithInstance { block(this, thisObj) }")
|
||||||
|
)
|
||||||
fun initWithInstance(block: suspend (ScopeFacade, Obj) -> Unit)
|
fun initWithInstance(block: suspend (ScopeFacade, Obj) -> Unit)
|
||||||
/** Bind a Lyng function/member to a Kotlin implementation (requires `extern` in Lyng). */
|
/** Bind a Lyng function/member to a Kotlin implementation (requires extern member in Lyng). */
|
||||||
|
fun addFun(name: String, impl: suspend ScopeFacade.() -> Obj)
|
||||||
|
/**
|
||||||
|
* Legacy addFun form.
|
||||||
|
* Prefer [addFun] with [ScopeFacade] receiver and use [ScopeFacade.thisObj]/[ScopeFacade.args].
|
||||||
|
*/
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addFun(name) { ... } with ScopeFacade receiver; use thisObj/args from scope",
|
||||||
|
replaceWith = ReplaceWith("addFun(name) { impl(this, thisObj, args) }")
|
||||||
|
)
|
||||||
fun addFun(name: String, impl: suspend (ScopeFacade, Obj, Arguments) -> Obj)
|
fun addFun(name: String, impl: suspend (ScopeFacade, Obj, Arguments) -> Obj)
|
||||||
/** Bind a read-only member (val/property getter) declared as `extern`. */
|
/** Bind a read-only member (val/property getter) declared extern in Lyng. */
|
||||||
|
fun addVal(name: String, impl: suspend ScopeFacade.() -> Obj)
|
||||||
|
/**
|
||||||
|
* Legacy addVal form.
|
||||||
|
* Prefer [addVal] with [ScopeFacade] receiver and use [ScopeFacade.thisObj].
|
||||||
|
*/
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addVal(name) { ... } with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith("addVal(name) { impl(this, thisObj) }")
|
||||||
|
)
|
||||||
fun addVal(name: String, impl: suspend (ScopeFacade, Obj) -> Obj)
|
fun addVal(name: String, impl: suspend (ScopeFacade, Obj) -> Obj)
|
||||||
/** Bind a mutable member (var/property getter/setter) declared as `extern`. */
|
/** Bind a mutable member (var/property getter/setter) declared extern in Lyng. */
|
||||||
|
fun addVar(
|
||||||
|
name: String,
|
||||||
|
get: suspend ScopeFacade.() -> Obj,
|
||||||
|
set: suspend ScopeFacade.(Obj) -> Unit
|
||||||
|
)
|
||||||
|
/**
|
||||||
|
* Legacy addVar form.
|
||||||
|
* Prefer [addVar] with [ScopeFacade] receiver and use [ScopeFacade.thisObj].
|
||||||
|
*/
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addVar(name, get, set) with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith(
|
||||||
|
"addVar(name, get = { get(this, thisObj) }, set = { value -> set(this, thisObj, value) })"
|
||||||
|
)
|
||||||
|
)
|
||||||
fun addVar(
|
fun addVar(
|
||||||
name: String,
|
name: String,
|
||||||
get: suspend (ScopeFacade, Obj) -> Obj,
|
get: suspend (ScopeFacade, Obj) -> Obj,
|
||||||
@@ -77,8 +120,9 @@ interface ClassBridgeBinder {
|
|||||||
* Entry point for Kotlin bindings to declared Lyng classes.
|
* Entry point for Kotlin bindings to declared Lyng classes.
|
||||||
*
|
*
|
||||||
* The workflow is Lyng-first: declare the class and its members in Lyng,
|
* The workflow is Lyng-first: declare the class and its members in Lyng,
|
||||||
* then bind the implementations from Kotlin. Bound members must be marked
|
* then bind the implementations from Kotlin. Bound members must be extern
|
||||||
* `extern` so the compiler emits the ABI slots for Kotlin to attach to.
|
* (explicitly or by enclosing `extern class` / `extern object`) so the compiler
|
||||||
|
* emits the ABI slots for Kotlin to attach to.
|
||||||
*/
|
*/
|
||||||
object LyngClassBridge {
|
object LyngClassBridge {
|
||||||
/**
|
/**
|
||||||
@@ -170,7 +214,7 @@ object LyngObjectBridge {
|
|||||||
/**
|
/**
|
||||||
* Sugar for [LyngClassBridge.bind] on a module scope.
|
* Sugar for [LyngClassBridge.bind] on a module scope.
|
||||||
*
|
*
|
||||||
* Bound members must be declared as `extern` in Lyng.
|
* Bound members must be extern in Lyng (explicitly or via enclosing extern class/object).
|
||||||
*/
|
*/
|
||||||
suspend fun ModuleScope.bind(
|
suspend fun ModuleScope.bind(
|
||||||
className: String,
|
className: String,
|
||||||
@@ -180,7 +224,7 @@ suspend fun ModuleScope.bind(
|
|||||||
/**
|
/**
|
||||||
* Sugar for [LyngObjectBridge.bind] on a module scope.
|
* Sugar for [LyngObjectBridge.bind] on a module scope.
|
||||||
*
|
*
|
||||||
* Bound members must be declared as `extern` in Lyng.
|
* Bound members must be extern in Lyng (explicitly or via enclosing extern class/object).
|
||||||
*/
|
*/
|
||||||
suspend fun ModuleScope.bindObject(
|
suspend fun ModuleScope.bindObject(
|
||||||
objectName: String,
|
objectName: String,
|
||||||
@@ -234,17 +278,27 @@ private class ClassBridgeBinderImpl(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun initWithInstance(block: suspend ScopeFacade.() -> Unit) {
|
||||||
|
initHooks.add { scope, _ ->
|
||||||
|
scope.block()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use initWithInstance { ... } with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith("initWithInstance { block(this, thisObj) }")
|
||||||
|
)
|
||||||
override fun initWithInstance(block: suspend (ScopeFacade, Obj) -> Unit) {
|
override fun initWithInstance(block: suspend (ScopeFacade, Obj) -> Unit) {
|
||||||
initHooks.add { scope, inst ->
|
initHooks.add { scope, inst ->
|
||||||
block(scope, inst)
|
block(scope, inst)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun addFun(name: String, impl: suspend (ScopeFacade, Obj, Arguments) -> Obj) {
|
override fun addFun(name: String, impl: suspend ScopeFacade.() -> Obj) {
|
||||||
ensureTemplateNotBuilt()
|
ensureTemplateNotBuilt()
|
||||||
val target = findMember(name)
|
val target = findMember(name)
|
||||||
val callable = ObjExternCallable.fromBridge {
|
val callable = ObjExternCallable.fromBridge {
|
||||||
impl(this, thisObj, args)
|
impl()
|
||||||
}
|
}
|
||||||
val methodId = cls.ensureMethodIdForBridge(name, target.record)
|
val methodId = cls.ensureMethodIdForBridge(name, target.record)
|
||||||
val newRecord = target.record.copy(
|
val newRecord = target.record.copy(
|
||||||
@@ -255,14 +309,24 @@ private class ClassBridgeBinderImpl(
|
|||||||
replaceMember(target, newRecord)
|
replaceMember(target, newRecord)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun addVal(name: String, impl: suspend (ScopeFacade, Obj) -> Obj) {
|
@Deprecated(
|
||||||
|
message = "Use addFun(name) { ... } with ScopeFacade receiver; use thisObj/args from scope",
|
||||||
|
replaceWith = ReplaceWith("addFun(name) { impl(this, thisObj, args) }")
|
||||||
|
)
|
||||||
|
override fun addFun(name: String, impl: suspend (ScopeFacade, Obj, Arguments) -> Obj) {
|
||||||
|
addFun(name) {
|
||||||
|
impl(this, thisObj, args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun addVal(name: String, impl: suspend ScopeFacade.() -> Obj) {
|
||||||
ensureTemplateNotBuilt()
|
ensureTemplateNotBuilt()
|
||||||
val target = findMember(name)
|
val target = findMember(name)
|
||||||
if (target.record.isMutable) {
|
if (target.record.isMutable) {
|
||||||
throw ScriptError(Pos.builtIn, "extern val $name is mutable in class ${cls.className}")
|
throw ScriptError(Pos.builtIn, "extern val $name is mutable in class ${cls.className}")
|
||||||
}
|
}
|
||||||
val getter = ObjExternCallable.fromBridge {
|
val getter = ObjExternCallable.fromBridge {
|
||||||
impl(this, thisObj)
|
impl()
|
||||||
}
|
}
|
||||||
val prop = ObjProperty(name, getter, null)
|
val prop = ObjProperty(name, getter, null)
|
||||||
val isFieldLike = target.record.type == ObjRecord.Type.Field ||
|
val isFieldLike = target.record.type == ObjRecord.Type.Field ||
|
||||||
@@ -287,10 +351,20 @@ private class ClassBridgeBinderImpl(
|
|||||||
replaceMember(target, newRecord)
|
replaceMember(target, newRecord)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addVal(name) { ... } with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith("addVal(name) { impl(this, thisObj) }")
|
||||||
|
)
|
||||||
|
override fun addVal(name: String, impl: suspend (ScopeFacade, Obj) -> Obj) {
|
||||||
|
addVal(name) {
|
||||||
|
impl(this, thisObj)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun addVar(
|
override fun addVar(
|
||||||
name: String,
|
name: String,
|
||||||
get: suspend (ScopeFacade, Obj) -> Obj,
|
get: suspend ScopeFacade.() -> Obj,
|
||||||
set: suspend (ScopeFacade, Obj, Obj) -> Unit
|
set: suspend ScopeFacade.(Obj) -> Unit
|
||||||
) {
|
) {
|
||||||
ensureTemplateNotBuilt()
|
ensureTemplateNotBuilt()
|
||||||
val target = findMember(name)
|
val target = findMember(name)
|
||||||
@@ -298,11 +372,11 @@ private class ClassBridgeBinderImpl(
|
|||||||
throw ScriptError(Pos.builtIn, "extern var $name is readonly in class ${cls.className}")
|
throw ScriptError(Pos.builtIn, "extern var $name is readonly in class ${cls.className}")
|
||||||
}
|
}
|
||||||
val getter = ObjExternCallable.fromBridge {
|
val getter = ObjExternCallable.fromBridge {
|
||||||
get(this, thisObj)
|
get()
|
||||||
}
|
}
|
||||||
val setter = ObjExternCallable.fromBridge {
|
val setter = ObjExternCallable.fromBridge {
|
||||||
val value = requiredArg<Obj>(0)
|
val value = requiredArg<Obj>(0)
|
||||||
set(this, thisObj, value)
|
set(value)
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
val prop = ObjProperty(name, getter, setter)
|
val prop = ObjProperty(name, getter, setter)
|
||||||
@@ -328,6 +402,24 @@ private class ClassBridgeBinderImpl(
|
|||||||
replaceMember(target, newRecord)
|
replaceMember(target, newRecord)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addVar(name, get, set) with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith(
|
||||||
|
"addVar(name, get = { get(this, thisObj) }, set = { value -> set(this, thisObj, value) })"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
override fun addVar(
|
||||||
|
name: String,
|
||||||
|
get: suspend (ScopeFacade, Obj) -> Obj,
|
||||||
|
set: suspend (ScopeFacade, Obj, Obj) -> Unit
|
||||||
|
) {
|
||||||
|
addVar(
|
||||||
|
name,
|
||||||
|
get = { get(this, thisObj) },
|
||||||
|
set = { value -> set(this, thisObj, value) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
fun commit() {
|
fun commit() {
|
||||||
if (initHooks.isNotEmpty()) {
|
if (initHooks.isNotEmpty()) {
|
||||||
val target = cls.bridgeInitHooks ?: mutableListOf<suspend (ScopeFacade, ObjInstance) -> Unit>().also {
|
val target = cls.bridgeInitHooks ?: mutableListOf<suspend (ScopeFacade, ObjInstance) -> Unit>().also {
|
||||||
@@ -399,16 +491,26 @@ private class ObjectBridgeBinderImpl(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun initWithInstance(block: suspend ScopeFacade.() -> Unit) {
|
||||||
|
initHooks.add { scope, _ ->
|
||||||
|
scope.block()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use initWithInstance { ... } with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith("initWithInstance { block(this, thisObj) }")
|
||||||
|
)
|
||||||
override fun initWithInstance(block: suspend (ScopeFacade, Obj) -> Unit) {
|
override fun initWithInstance(block: suspend (ScopeFacade, Obj) -> Unit) {
|
||||||
initHooks.add { scope, inst ->
|
initHooks.add { scope, inst ->
|
||||||
block(scope, inst)
|
block(scope, inst)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun addFun(name: String, impl: suspend (ScopeFacade, Obj, Arguments) -> Obj) {
|
override fun addFun(name: String, impl: suspend ScopeFacade.() -> Obj) {
|
||||||
val target = findMember(name)
|
val target = findMember(name)
|
||||||
val callable = ObjExternCallable.fromBridge {
|
val callable = ObjExternCallable.fromBridge {
|
||||||
impl(this, thisObj, args)
|
impl()
|
||||||
}
|
}
|
||||||
val methodId = cls.ensureMethodIdForBridge(name, target.record)
|
val methodId = cls.ensureMethodIdForBridge(name, target.record)
|
||||||
val newRecord = target.record.copy(
|
val newRecord = target.record.copy(
|
||||||
@@ -420,13 +522,23 @@ private class ObjectBridgeBinderImpl(
|
|||||||
updateInstanceMember(target, newRecord)
|
updateInstanceMember(target, newRecord)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun addVal(name: String, impl: suspend (ScopeFacade, Obj) -> Obj) {
|
@Deprecated(
|
||||||
|
message = "Use addFun(name) { ... } with ScopeFacade receiver; use thisObj/args from scope",
|
||||||
|
replaceWith = ReplaceWith("addFun(name) { impl(this, thisObj, args) }")
|
||||||
|
)
|
||||||
|
override fun addFun(name: String, impl: suspend (ScopeFacade, Obj, Arguments) -> Obj) {
|
||||||
|
addFun(name) {
|
||||||
|
impl(this, thisObj, args)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun addVal(name: String, impl: suspend ScopeFacade.() -> Obj) {
|
||||||
val target = findMember(name)
|
val target = findMember(name)
|
||||||
if (target.record.isMutable) {
|
if (target.record.isMutable) {
|
||||||
throw ScriptError(Pos.builtIn, "extern val $name is mutable in class ${cls.className}")
|
throw ScriptError(Pos.builtIn, "extern val $name is mutable in class ${cls.className}")
|
||||||
}
|
}
|
||||||
val getter = ObjExternCallable.fromBridge {
|
val getter = ObjExternCallable.fromBridge {
|
||||||
impl(this, thisObj)
|
impl()
|
||||||
}
|
}
|
||||||
val prop = ObjProperty(name, getter, null)
|
val prop = ObjProperty(name, getter, null)
|
||||||
val isFieldLike = target.record.type == ObjRecord.Type.Field ||
|
val isFieldLike = target.record.type == ObjRecord.Type.Field ||
|
||||||
@@ -452,21 +564,31 @@ private class ObjectBridgeBinderImpl(
|
|||||||
updateInstanceMember(target, newRecord)
|
updateInstanceMember(target, newRecord)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addVal(name) { ... } with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith("addVal(name) { impl(this, thisObj) }")
|
||||||
|
)
|
||||||
|
override fun addVal(name: String, impl: suspend (ScopeFacade, Obj) -> Obj) {
|
||||||
|
addVal(name) {
|
||||||
|
impl(this, thisObj)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun addVar(
|
override fun addVar(
|
||||||
name: String,
|
name: String,
|
||||||
get: suspend (ScopeFacade, Obj) -> Obj,
|
get: suspend ScopeFacade.() -> Obj,
|
||||||
set: suspend (ScopeFacade, Obj, Obj) -> Unit
|
set: suspend ScopeFacade.(Obj) -> Unit
|
||||||
) {
|
) {
|
||||||
val target = findMember(name)
|
val target = findMember(name)
|
||||||
if (!target.record.isMutable) {
|
if (!target.record.isMutable) {
|
||||||
throw ScriptError(Pos.builtIn, "extern var $name is readonly in class ${cls.className}")
|
throw ScriptError(Pos.builtIn, "extern var $name is readonly in class ${cls.className}")
|
||||||
}
|
}
|
||||||
val getter = ObjExternCallable.fromBridge {
|
val getter = ObjExternCallable.fromBridge {
|
||||||
get(this, thisObj)
|
get()
|
||||||
}
|
}
|
||||||
val setter = ObjExternCallable.fromBridge {
|
val setter = ObjExternCallable.fromBridge {
|
||||||
val value = requiredArg<Obj>(0)
|
val value = requiredArg<Obj>(0)
|
||||||
set(this, thisObj, value)
|
set(value)
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
val prop = ObjProperty(name, getter, setter)
|
val prop = ObjProperty(name, getter, setter)
|
||||||
@@ -493,6 +615,24 @@ private class ObjectBridgeBinderImpl(
|
|||||||
updateInstanceMember(target, newRecord)
|
updateInstanceMember(target, newRecord)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Deprecated(
|
||||||
|
message = "Use addVar(name, get, set) with ScopeFacade receiver; use thisObj from scope",
|
||||||
|
replaceWith = ReplaceWith(
|
||||||
|
"addVar(name, get = { get(this, thisObj) }, set = { value -> set(this, thisObj, value) })"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
override fun addVar(
|
||||||
|
name: String,
|
||||||
|
get: suspend (ScopeFacade, Obj) -> Obj,
|
||||||
|
set: suspend (ScopeFacade, Obj, Obj) -> Unit
|
||||||
|
) {
|
||||||
|
addVar(
|
||||||
|
name,
|
||||||
|
get = { get(this, thisObj) },
|
||||||
|
set = { value -> set(this, thisObj, value) }
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun commit() {
|
suspend fun commit() {
|
||||||
if (initHooks.isNotEmpty()) {
|
if (initHooks.isNotEmpty()) {
|
||||||
val target = cls.bridgeInitHooks ?: mutableListOf<suspend (ScopeFacade, ObjInstance) -> Unit>().also {
|
val target = cls.bridgeInitHooks ?: mutableListOf<suspend (ScopeFacade, ObjInstance) -> Unit>().also {
|
||||||
|
|||||||
@@ -0,0 +1,264 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.bridge
|
||||||
|
|
||||||
|
import net.sergeych.lyng.*
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjBool
|
||||||
|
import net.sergeych.lyng.obj.ObjExternCallable
|
||||||
|
import net.sergeych.lyng.obj.ObjInt
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjProperty
|
||||||
|
import net.sergeych.lyng.obj.ObjReal
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
import net.sergeych.lyng.obj.toBool
|
||||||
|
import net.sergeych.lyng.obj.toDouble
|
||||||
|
import net.sergeych.lyng.obj.toInt
|
||||||
|
import net.sergeych.lyng.obj.toLong
|
||||||
|
import net.sergeych.lyng.obj.toObj
|
||||||
|
import net.sergeych.lyng.requiredArg
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Global/module-level binding API for Lyng-first extern declarations.
|
||||||
|
*
|
||||||
|
* Typical flow:
|
||||||
|
* 1) declare `extern fun` / `extern val` / `extern var` in Lyng module;
|
||||||
|
* 2) bind Kotlin implementation using this API.
|
||||||
|
*/
|
||||||
|
interface LyngGlobalBinder {
|
||||||
|
fun bindGlobalFunRaw(
|
||||||
|
name: String,
|
||||||
|
fn: suspend (scope: ScopeFacade, args: Arguments) -> Obj
|
||||||
|
)
|
||||||
|
|
||||||
|
fun bindGlobalFun(
|
||||||
|
name: String,
|
||||||
|
fn: suspend GlobalArgReader.() -> Obj
|
||||||
|
)
|
||||||
|
|
||||||
|
fun bindGlobalVarRaw(
|
||||||
|
name: String,
|
||||||
|
get: suspend (scope: ScopeFacade) -> Obj,
|
||||||
|
set: (suspend (scope: ScopeFacade, value: Obj) -> Unit)? = null
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Reader helper for Kotlin-typed argument access.
|
||||||
|
*/
|
||||||
|
interface GlobalArgReader {
|
||||||
|
val scope: ScopeFacade
|
||||||
|
val args: Arguments
|
||||||
|
val size: Int
|
||||||
|
|
||||||
|
fun requireExactCount(count: Int)
|
||||||
|
fun obj(index: Int): Obj
|
||||||
|
fun objOrNull(index: Int): Obj?
|
||||||
|
fun int(index: Int): Int
|
||||||
|
fun long(index: Int): Long
|
||||||
|
fun double(index: Int): Double
|
||||||
|
fun bool(index: Int): Boolean
|
||||||
|
fun string(index: Int): String
|
||||||
|
}
|
||||||
|
|
||||||
|
private class ModuleGlobalBinder(
|
||||||
|
private val module: ModuleScope
|
||||||
|
) : LyngGlobalBinder {
|
||||||
|
|
||||||
|
override fun bindGlobalFunRaw(
|
||||||
|
name: String,
|
||||||
|
fn: suspend (scope: ScopeFacade, args: Arguments) -> Obj
|
||||||
|
) {
|
||||||
|
val existing = module[name]
|
||||||
|
val callable = ObjExternCallable.fromBridge {
|
||||||
|
fn(this, args)
|
||||||
|
}
|
||||||
|
module.addItem(
|
||||||
|
name = name,
|
||||||
|
isMutable = false,
|
||||||
|
value = callable,
|
||||||
|
visibility = existing?.visibility ?: Visibility.Public,
|
||||||
|
writeVisibility = existing?.writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Fun,
|
||||||
|
callSignature = existing?.callSignature,
|
||||||
|
typeDecl = existing?.typeDecl
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun bindGlobalFun(
|
||||||
|
name: String,
|
||||||
|
fn: suspend GlobalArgReader.() -> Obj
|
||||||
|
) {
|
||||||
|
bindGlobalFunRaw(name) { scope, args ->
|
||||||
|
val reader = GlobalArgReaderImpl(scope, args)
|
||||||
|
fn(reader)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun bindGlobalVarRaw(
|
||||||
|
name: String,
|
||||||
|
get: suspend (scope: ScopeFacade) -> Obj,
|
||||||
|
set: (suspend (scope: ScopeFacade, value: Obj) -> Unit)?
|
||||||
|
) {
|
||||||
|
val existing = module[name]
|
||||||
|
if (existing != null) {
|
||||||
|
if (existing.isMutable && set == null) {
|
||||||
|
throw net.sergeych.lyng.ScriptError(Pos.builtIn, "extern var $name requires a setter")
|
||||||
|
}
|
||||||
|
if (!existing.isMutable && set != null) {
|
||||||
|
throw net.sergeych.lyng.ScriptError(Pos.builtIn, "extern val $name does not allow a setter")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val mutable = existing?.isMutable ?: (set != null)
|
||||||
|
val getter = ObjExternCallable.fromBridge {
|
||||||
|
get(this)
|
||||||
|
}
|
||||||
|
val setter = set?.let { setterImpl ->
|
||||||
|
ObjExternCallable.fromBridge {
|
||||||
|
setterImpl(this, requiredArg(0))
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
module.addItem(
|
||||||
|
name = name,
|
||||||
|
isMutable = mutable,
|
||||||
|
value = ObjProperty(name, getter, setter),
|
||||||
|
visibility = existing?.visibility ?: Visibility.Public,
|
||||||
|
writeVisibility = existing?.writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Property,
|
||||||
|
callSignature = existing?.callSignature,
|
||||||
|
typeDecl = existing?.typeDecl
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private class GlobalArgReaderImpl(
|
||||||
|
override val scope: ScopeFacade,
|
||||||
|
override val args: Arguments
|
||||||
|
) : GlobalArgReader {
|
||||||
|
override val size: Int
|
||||||
|
get() = args.list.size
|
||||||
|
|
||||||
|
override fun requireExactCount(count: Int) {
|
||||||
|
if (size != count) scope.raiseIllegalArgument("Expected exactly $count arguments, got $size")
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun obj(index: Int): Obj =
|
||||||
|
objOrNull(index) ?: scope.raiseIllegalArgument("Missing required argument at index $index")
|
||||||
|
|
||||||
|
override fun objOrNull(index: Int): Obj? =
|
||||||
|
args.list.getOrNull(index)
|
||||||
|
|
||||||
|
override fun int(index: Int): Int = long(index).toInt()
|
||||||
|
|
||||||
|
override fun long(index: Int): Long = obj(index).toLong()
|
||||||
|
|
||||||
|
override fun double(index: Int): Double = obj(index).toDouble()
|
||||||
|
|
||||||
|
override fun bool(index: Int): Boolean = obj(index).toBool()
|
||||||
|
|
||||||
|
override fun string(index: Int): String {
|
||||||
|
val value = obj(index)
|
||||||
|
return (value as? ObjString)?.value
|
||||||
|
?: scope.raiseClassCastError("Expected String at index $index, got ${value.objClass.className}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ModuleScope.globalBinder(): LyngGlobalBinder = ModuleGlobalBinder(this)
|
||||||
|
|
||||||
|
inline fun <reified T> GlobalArgReader.required(index: Int): T =
|
||||||
|
coerceArg(scope, obj(index), index)
|
||||||
|
|
||||||
|
inline fun <reified T> GlobalArgReader.optional(index: Int, default: T): T {
|
||||||
|
val value = objOrNull(index) ?: return default
|
||||||
|
return coerceArg(scope, value, index)
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified A1> LyngGlobalBinder.bindGlobalFun1(
|
||||||
|
name: String,
|
||||||
|
noinline fn: suspend (A1) -> Obj
|
||||||
|
) {
|
||||||
|
bindGlobalFun(name) {
|
||||||
|
requireExactCount(1)
|
||||||
|
fn(required(0))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified A1, reified A2> LyngGlobalBinder.bindGlobalFun2(
|
||||||
|
name: String,
|
||||||
|
noinline fn: suspend (A1, A2) -> Obj
|
||||||
|
) {
|
||||||
|
bindGlobalFun(name) {
|
||||||
|
requireExactCount(2)
|
||||||
|
fn(required(0), required(1))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified A1, reified A2, reified A3> LyngGlobalBinder.bindGlobalFun3(
|
||||||
|
name: String,
|
||||||
|
noinline fn: suspend (A1, A2, A3) -> Obj
|
||||||
|
) {
|
||||||
|
bindGlobalFun(name) {
|
||||||
|
requireExactCount(3)
|
||||||
|
fn(required(0), required(1), required(2))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inline fun <reified T> LyngGlobalBinder.bindGlobalVar(
|
||||||
|
name: String,
|
||||||
|
noinline get: suspend () -> T,
|
||||||
|
noinline set: (suspend (T) -> Unit)? = null
|
||||||
|
) {
|
||||||
|
bindGlobalVarRaw(
|
||||||
|
name = name,
|
||||||
|
get = { get().toObj() },
|
||||||
|
set = set?.let { setter ->
|
||||||
|
{ scope, value ->
|
||||||
|
setter(coerceArg<T>(scope = scope, value = value, index = 0))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@PublishedApi
|
||||||
|
internal inline fun <reified T> coerceArg(scope: ScopeFacade, value: Obj, index: Int): T {
|
||||||
|
if (value === ObjNull && null is T) return null as T
|
||||||
|
(value as? T)?.let { return it }
|
||||||
|
@Suppress("UNCHECKED_CAST")
|
||||||
|
return when (T::class) {
|
||||||
|
Int::class -> value.toInt() as T
|
||||||
|
Long::class -> value.toLong() as T
|
||||||
|
Double::class -> value.toDouble() as T
|
||||||
|
Float::class -> value.toDouble().toFloat() as T
|
||||||
|
Boolean::class -> value.toBool() as T
|
||||||
|
String::class -> (value as? ObjString)?.value as? T
|
||||||
|
?: scope.raiseClassCastError("Expected String at index $index, got ${value.objClass.className}")
|
||||||
|
Obj::class -> value as T
|
||||||
|
ObjInt::class -> (value as? ObjInt) as? T
|
||||||
|
?: scope.raiseClassCastError("Expected ObjInt at index $index, got ${value.objClass.className}")
|
||||||
|
ObjString::class -> (value as? ObjString) as? T
|
||||||
|
?: scope.raiseClassCastError("Expected ObjString at index $index, got ${value.objClass.className}")
|
||||||
|
ObjReal::class -> (value as? ObjReal) as? T
|
||||||
|
?: scope.raiseClassCastError("Expected ObjReal at index $index, got ${value.objClass.className}")
|
||||||
|
ObjBool::class -> (value as? ObjBool) as? T
|
||||||
|
?: scope.raiseClassCastError("Expected ObjBool at index $index, got ${value.objClass.className}")
|
||||||
|
else -> scope.raiseClassCastError("Unsupported typed argument binding for ${T::class.simpleName}")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -35,6 +35,7 @@ class BytecodeCompiler(
|
|||||||
private val slotTypeByScopeId: Map<Int, Map<Int, ObjClass>> = emptyMap(),
|
private val slotTypeByScopeId: Map<Int, Map<Int, ObjClass>> = emptyMap(),
|
||||||
private val slotTypeDeclByScopeId: Map<Int, Map<Int, TypeDecl>> = emptyMap(),
|
private val slotTypeDeclByScopeId: Map<Int, Map<Int, TypeDecl>> = emptyMap(),
|
||||||
private val knownNameObjClass: Map<String, ObjClass> = emptyMap(),
|
private val knownNameObjClass: Map<String, ObjClass> = emptyMap(),
|
||||||
|
private val knownClassNames: Set<String> = emptySet(),
|
||||||
private val knownObjectNames: Set<String> = emptySet(),
|
private val knownObjectNames: Set<String> = emptySet(),
|
||||||
private val classFieldTypesByName: Map<String, Map<String, ObjClass>> = emptyMap(),
|
private val classFieldTypesByName: Map<String, Map<String, ObjClass>> = emptyMap(),
|
||||||
private val enumEntriesByName: Map<String, List<String>> = emptyMap(),
|
private val enumEntriesByName: Map<String, List<String>> = emptyMap(),
|
||||||
@@ -78,7 +79,6 @@ class BytecodeCompiler(
|
|||||||
private val stableObjSlots = mutableSetOf<Int>()
|
private val stableObjSlots = mutableSetOf<Int>()
|
||||||
private val nameObjClass = knownNameObjClass.toMutableMap()
|
private val nameObjClass = knownNameObjClass.toMutableMap()
|
||||||
private val listElementClassBySlot = mutableMapOf<Int, ObjClass>()
|
private val listElementClassBySlot = mutableMapOf<Int, ObjClass>()
|
||||||
private val knownClassNames = knownNameObjClass.keys.toSet()
|
|
||||||
private val slotInitClassByKey = mutableMapOf<ScopeSlotKey, ObjClass>()
|
private val slotInitClassByKey = mutableMapOf<ScopeSlotKey, ObjClass>()
|
||||||
private val intLoopVarNames = LinkedHashSet<String>()
|
private val intLoopVarNames = LinkedHashSet<String>()
|
||||||
private val valueFnRefs = LinkedHashSet<ValueFnRef>()
|
private val valueFnRefs = LinkedHashSet<ValueFnRef>()
|
||||||
@@ -522,7 +522,7 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (resolved == SlotType.UNKNOWN) {
|
if (resolved == SlotType.UNKNOWN) {
|
||||||
val inferred = slotTypeFromClass(nameObjClass[ref.name])
|
val inferred = if (knownClassNames.contains(ref.name)) null else slotTypeFromClass(nameObjClass[ref.name])
|
||||||
if (inferred != null) {
|
if (inferred != null) {
|
||||||
updateSlotType(mapped, inferred)
|
updateSlotType(mapped, inferred)
|
||||||
resolved = inferred
|
resolved = inferred
|
||||||
@@ -1067,18 +1067,9 @@ class BytecodeCompiler(
|
|||||||
updateSlotType(dst, SlotType.OBJ)
|
updateSlotType(dst, SlotType.OBJ)
|
||||||
return CompiledValue(dst, SlotType.OBJ)
|
return CompiledValue(dst, SlotType.OBJ)
|
||||||
}
|
}
|
||||||
if (receiverClass == null && memberName == "negate") {
|
if (memberName == "negate" &&
|
||||||
val zeroId = builder.addConst(BytecodeConst.IntVal(0))
|
(receiverClass == null || isDelegateClass(receiverClass) || receiverClass in setOf(ObjInt.type, ObjReal.type))
|
||||||
val zeroSlot = allocSlot()
|
) {
|
||||||
builder.emit(Opcode.CONST_INT, zeroId, zeroSlot)
|
|
||||||
updateSlotType(zeroSlot, SlotType.INT)
|
|
||||||
val obj = ensureObjSlot(value)
|
|
||||||
val dst = allocSlot()
|
|
||||||
builder.emit(Opcode.SUB_OBJ, zeroSlot, obj.slot, dst)
|
|
||||||
updateSlotType(dst, SlotType.OBJ)
|
|
||||||
return CompiledValue(dst, SlotType.OBJ)
|
|
||||||
}
|
|
||||||
if (memberName == "negate" && receiverClass in setOf(ObjInt.type, ObjReal.type)) {
|
|
||||||
val zeroId = builder.addConst(BytecodeConst.IntVal(0))
|
val zeroId = builder.addConst(BytecodeConst.IntVal(0))
|
||||||
val zeroSlot = allocSlot()
|
val zeroSlot = allocSlot()
|
||||||
builder.emit(Opcode.CONST_INT, zeroId, zeroSlot)
|
builder.emit(Opcode.CONST_INT, zeroId, zeroSlot)
|
||||||
@@ -1095,6 +1086,11 @@ class BytecodeCompiler(
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun isDelegateClass(receiverClass: ObjClass): Boolean =
|
||||||
|
receiverClass.className == "Delegate" ||
|
||||||
|
receiverClass.className == "LazyDelegate" ||
|
||||||
|
receiverClass.implementingNames.contains("Delegate")
|
||||||
|
|
||||||
private fun operatorMemberName(op: BinOp): String? = when (op) {
|
private fun operatorMemberName(op: BinOp): String? = when (op) {
|
||||||
BinOp.PLUS -> "plus"
|
BinOp.PLUS -> "plus"
|
||||||
BinOp.MINUS -> "minus"
|
BinOp.MINUS -> "minus"
|
||||||
@@ -1142,11 +1138,7 @@ class BytecodeCompiler(
|
|||||||
): CompiledValue? {
|
): CompiledValue? {
|
||||||
val memberName = operatorMemberName(op) ?: return null
|
val memberName = operatorMemberName(op) ?: return null
|
||||||
val receiverClass = resolveReceiverClass(leftRef)
|
val receiverClass = resolveReceiverClass(leftRef)
|
||||||
if (receiverClass == null ||
|
if (receiverClass == null || isDelegateClass(receiverClass)) {
|
||||||
receiverClass.className == "Delegate" ||
|
|
||||||
receiverClass.className == "LazyDelegate" ||
|
|
||||||
receiverClass.implementingNames.contains("Delegate")
|
|
||||||
) {
|
|
||||||
val objOpcode = when (op) {
|
val objOpcode = when (op) {
|
||||||
BinOp.PLUS -> Opcode.ADD_OBJ
|
BinOp.PLUS -> Opcode.ADD_OBJ
|
||||||
BinOp.MINUS -> Opcode.SUB_OBJ
|
BinOp.MINUS -> Opcode.SUB_OBJ
|
||||||
@@ -1638,7 +1630,7 @@ class BytecodeCompiler(
|
|||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else -> null
|
//else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3268,9 +3260,10 @@ class BytecodeCompiler(
|
|||||||
if (ref.name.isBlank()) {
|
if (ref.name.isBlank()) {
|
||||||
return compileRefWithFallback(ref.target, null, Pos.builtIn)
|
return compileRefWithFallback(ref.target, null, Pos.builtIn)
|
||||||
}
|
}
|
||||||
|
val pos = callSitePos()
|
||||||
val receiverClass = resolveReceiverClass(ref.target) ?: ObjDynamic.type
|
val receiverClass = resolveReceiverClass(ref.target) ?: ObjDynamic.type
|
||||||
if (receiverClass == ObjDynamic.type) {
|
if (receiverClass == ObjDynamic.type) {
|
||||||
val receiver = compileRefWithFallback(ref.target, null, Pos.builtIn) ?: return null
|
val receiver = compileRefWithFallback(ref.target, null, pos) ?: return null
|
||||||
val dst = allocSlot()
|
val dst = allocSlot()
|
||||||
val nameId = builder.addConst(BytecodeConst.StringVal(ref.name))
|
val nameId = builder.addConst(BytecodeConst.StringVal(ref.name))
|
||||||
if (!ref.isOptional) {
|
if (!ref.isOptional) {
|
||||||
@@ -3296,7 +3289,7 @@ class BytecodeCompiler(
|
|||||||
return CompiledValue(dst, SlotType.OBJ)
|
return CompiledValue(dst, SlotType.OBJ)
|
||||||
}
|
}
|
||||||
if (receiverClass is ObjInstanceClass && !isThisReceiver(ref.target)) {
|
if (receiverClass is ObjInstanceClass && !isThisReceiver(ref.target)) {
|
||||||
val receiver = compileRefWithFallback(ref.target, null, Pos.builtIn) ?: return null
|
val receiver = compileRefWithFallback(ref.target, null, pos) ?: return null
|
||||||
val dst = allocSlot()
|
val dst = allocSlot()
|
||||||
val nameId = builder.addConst(BytecodeConst.StringVal(ref.name))
|
val nameId = builder.addConst(BytecodeConst.StringVal(ref.name))
|
||||||
if (!ref.isOptional) {
|
if (!ref.isOptional) {
|
||||||
@@ -3323,7 +3316,7 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
val resolvedMember = receiverClass.resolveInstanceMember(ref.name)
|
val resolvedMember = receiverClass.resolveInstanceMember(ref.name)
|
||||||
if (resolvedMember?.declaringClass?.className == "Obj") {
|
if (resolvedMember?.declaringClass?.className == "Obj") {
|
||||||
val receiver = compileRefWithFallback(ref.target, null, Pos.builtIn) ?: return null
|
val receiver = compileRefWithFallback(ref.target, null, pos) ?: return null
|
||||||
val dst = allocSlot()
|
val dst = allocSlot()
|
||||||
val nameId = builder.addConst(BytecodeConst.StringVal(ref.name))
|
val nameId = builder.addConst(BytecodeConst.StringVal(ref.name))
|
||||||
if (!ref.isOptional) {
|
if (!ref.isOptional) {
|
||||||
@@ -3352,7 +3345,7 @@ class BytecodeCompiler(
|
|||||||
val methodId = if (resolvedMember != null) receiverClass.instanceMethodIdMap(includeAbstract = true)[ref.name] else null
|
val methodId = if (resolvedMember != null) receiverClass.instanceMethodIdMap(includeAbstract = true)[ref.name] else null
|
||||||
val encodedFieldId = encodeMemberId(receiverClass, fieldId)
|
val encodedFieldId = encodeMemberId(receiverClass, fieldId)
|
||||||
val encodedMethodId = encodeMemberId(receiverClass, methodId)
|
val encodedMethodId = encodeMemberId(receiverClass, methodId)
|
||||||
val receiver = compileRefWithFallback(ref.target, null, Pos.builtIn) ?: return null
|
val receiver = compileRefWithFallback(ref.target, null, pos) ?: return null
|
||||||
val dst = allocSlot()
|
val dst = allocSlot()
|
||||||
if (fieldId == null && methodId == null && (isKnownClassReceiver(ref.target) || isClassNameRef(ref.target, receiverClass)) &&
|
if (fieldId == null && methodId == null && (isKnownClassReceiver(ref.target) || isClassNameRef(ref.target, receiverClass)) &&
|
||||||
(isClassSlot(receiver.slot) || receiverClass == ObjClassType)
|
(isClassSlot(receiver.slot) || receiverClass == ObjClassType)
|
||||||
@@ -4344,6 +4337,22 @@ class BytecodeCompiler(
|
|||||||
CompiledValue(neg, SlotType.BOOL)
|
CompiledValue(neg, SlotType.BOOL)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
is WhenNullableCondition -> {
|
||||||
|
val nullSlot = allocSlot()
|
||||||
|
builder.emit(Opcode.CONST_NULL, nullSlot)
|
||||||
|
updateSlotType(nullSlot, SlotType.OBJ)
|
||||||
|
val baseDst = allocSlot()
|
||||||
|
builder.emit(Opcode.CHECK_IS, nullSlot, subject.slot, baseDst)
|
||||||
|
updateSlotType(baseDst, SlotType.BOOL)
|
||||||
|
if (!cond.negated) {
|
||||||
|
CompiledValue(baseDst, SlotType.BOOL)
|
||||||
|
} else {
|
||||||
|
val neg = allocSlot()
|
||||||
|
builder.emit(Opcode.NOT_BOOL, baseDst, neg)
|
||||||
|
updateSlotType(neg, SlotType.BOOL)
|
||||||
|
CompiledValue(neg, SlotType.BOOL)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4394,7 +4403,7 @@ class BytecodeCompiler(
|
|||||||
val dst = allocSlot()
|
val dst = allocSlot()
|
||||||
val encodedMethodId = encodeMemberId(receiverClass, methodId) ?: methodId
|
val encodedMethodId = encodeMemberId(receiverClass, methodId) ?: methodId
|
||||||
if (!ref.isOptionalInvoke) {
|
if (!ref.isOptionalInvoke) {
|
||||||
val args = compileCallArgs(ref.args, ref.tailBlock) ?: return null
|
val args = compileCallArgs(ref.args, ref.tailBlock, ref.explicitTypeArgs) ?: return null
|
||||||
val encodedCount = encodeCallArgCount(args) ?: return null
|
val encodedCount = encodeCallArgCount(args) ?: return null
|
||||||
setPos(callPos)
|
setPos(callPos)
|
||||||
builder.emit(Opcode.CALL_MEMBER_SLOT, receiver.slot, encodedMethodId, args.base, encodedCount, dst)
|
builder.emit(Opcode.CALL_MEMBER_SLOT, receiver.slot, encodedMethodId, args.base, encodedCount, dst)
|
||||||
@@ -4409,7 +4418,7 @@ class BytecodeCompiler(
|
|||||||
Opcode.JMP_IF_TRUE,
|
Opcode.JMP_IF_TRUE,
|
||||||
listOf(CmdBuilder.Operand.IntVal(cmpSlot), CmdBuilder.Operand.LabelRef(nullLabel))
|
listOf(CmdBuilder.Operand.IntVal(cmpSlot), CmdBuilder.Operand.LabelRef(nullLabel))
|
||||||
)
|
)
|
||||||
val args = compileCallArgs(ref.args, ref.tailBlock) ?: return null
|
val args = compileCallArgs(ref.args, ref.tailBlock, ref.explicitTypeArgs) ?: return null
|
||||||
val encodedCount = encodeCallArgCount(args) ?: return null
|
val encodedCount = encodeCallArgCount(args) ?: return null
|
||||||
setPos(callPos)
|
setPos(callPos)
|
||||||
builder.emit(Opcode.CALL_MEMBER_SLOT, receiver.slot, encodedMethodId, args.base, encodedCount, dst)
|
builder.emit(Opcode.CALL_MEMBER_SLOT, receiver.slot, encodedMethodId, args.base, encodedCount, dst)
|
||||||
@@ -4438,13 +4447,18 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
val initClass = when (localTarget?.name) {
|
val initClass = when (localTarget?.name) {
|
||||||
"List" -> ObjList.type
|
"List" -> ObjList.type
|
||||||
|
"ImmutableList" -> ObjImmutableList.type
|
||||||
|
"ObservableList" -> ObjObservableList.type
|
||||||
"Map" -> ObjMap.type
|
"Map" -> ObjMap.type
|
||||||
|
"ImmutableMap" -> ObjImmutableMap.type
|
||||||
|
"Set" -> ObjSet.type
|
||||||
|
"ImmutableSet" -> ObjImmutableSet.type
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
val callee = compileRefWithFallback(ref.target, null, refPosOrCurrent(ref.target)) ?: return null
|
val callee = compileRefWithFallback(ref.target, null, refPosOrCurrent(ref.target)) ?: return null
|
||||||
val dst = allocSlot()
|
val dst = allocSlot()
|
||||||
if (!ref.isOptionalInvoke) {
|
if (!ref.isOptionalInvoke) {
|
||||||
val args = compileCallArgs(ref.args, ref.tailBlock) ?: return null
|
val args = compileCallArgs(ref.args, ref.tailBlock, ref.explicitTypeArgs) ?: return null
|
||||||
val encodedCount = encodeCallArgCount(args) ?: return null
|
val encodedCount = encodeCallArgCount(args) ?: return null
|
||||||
setPos(callPos)
|
setPos(callPos)
|
||||||
builder.emit(
|
builder.emit(
|
||||||
@@ -4469,7 +4483,7 @@ class BytecodeCompiler(
|
|||||||
Opcode.JMP_IF_TRUE,
|
Opcode.JMP_IF_TRUE,
|
||||||
listOf(CmdBuilder.Operand.IntVal(cmpSlot), CmdBuilder.Operand.LabelRef(nullLabel))
|
listOf(CmdBuilder.Operand.IntVal(cmpSlot), CmdBuilder.Operand.LabelRef(nullLabel))
|
||||||
)
|
)
|
||||||
val args = compileCallArgs(ref.args, ref.tailBlock) ?: return null
|
val args = compileCallArgs(ref.args, ref.tailBlock, ref.explicitTypeArgs) ?: return null
|
||||||
val encodedCount = encodeCallArgCount(args) ?: return null
|
val encodedCount = encodeCallArgCount(args) ?: return null
|
||||||
setPos(callPos)
|
setPos(callPos)
|
||||||
builder.emit(
|
builder.emit(
|
||||||
@@ -4799,9 +4813,26 @@ class BytecodeCompiler(
|
|||||||
|
|
||||||
private data class CallArgs(val base: Int, val count: Int, val planId: Int?)
|
private data class CallArgs(val base: Int, val count: Int, val planId: Int?)
|
||||||
|
|
||||||
private fun resolveExtensionCallableSlot(receiverClass: ObjClass, memberName: String): CompiledValue? {
|
private fun extensionReceiverTypeNames(receiverClass: ObjClass): Set<String> {
|
||||||
|
val names = LinkedHashSet<String>()
|
||||||
for (cls in receiverClass.mro) {
|
for (cls in receiverClass.mro) {
|
||||||
val candidate = extensionCallableName(cls.className, memberName)
|
names.add(cls.className)
|
||||||
|
for ((knownName, knownClass) in nameObjClass) {
|
||||||
|
if (knownClass !== cls && knownClass.className != cls.className) continue
|
||||||
|
names.add(knownName)
|
||||||
|
names.add(knownName.substringAfterLast('.'))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return names
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun resolveExtensionSlotByReceiverNames(
|
||||||
|
receiverClass: ObjClass,
|
||||||
|
memberName: String,
|
||||||
|
wrapperName: (String, String) -> String
|
||||||
|
): CompiledValue? {
|
||||||
|
for (receiverName in extensionReceiverTypeNames(receiverClass)) {
|
||||||
|
val candidate = wrapperName(receiverName, memberName)
|
||||||
if (allowedScopeNames != null &&
|
if (allowedScopeNames != null &&
|
||||||
!allowedScopeNames.contains(candidate) &&
|
!allowedScopeNames.contains(candidate) &&
|
||||||
!localSlotIndexByName.containsKey(candidate)
|
!localSlotIndexByName.containsKey(candidate)
|
||||||
@@ -4813,32 +4844,39 @@ class BytecodeCompiler(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun resolveUniqueExtensionWrapperSlot(
|
||||||
|
memberName: String,
|
||||||
|
wrapperPrefix: String
|
||||||
|
): CompiledValue? {
|
||||||
|
val suffix = "__$memberName"
|
||||||
|
val candidates = LinkedHashSet<String>()
|
||||||
|
for (name in localSlotIndexByName.keys) {
|
||||||
|
if (name.startsWith(wrapperPrefix) && name.endsWith(suffix)) {
|
||||||
|
candidates.add(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (name in scopeSlotIndexByName.keys) {
|
||||||
|
if (name.startsWith(wrapperPrefix) && name.endsWith(suffix)) {
|
||||||
|
candidates.add(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (candidates.size != 1) return null
|
||||||
|
return resolveDirectNameSlot(candidates.first())
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun resolveExtensionCallableSlot(receiverClass: ObjClass, memberName: String): CompiledValue? {
|
||||||
|
return resolveExtensionSlotByReceiverNames(receiverClass, memberName, ::extensionCallableName)
|
||||||
|
?: resolveUniqueExtensionWrapperSlot(memberName, "__ext__")
|
||||||
|
}
|
||||||
|
|
||||||
private fun resolveExtensionGetterSlot(receiverClass: ObjClass, memberName: String): CompiledValue? {
|
private fun resolveExtensionGetterSlot(receiverClass: ObjClass, memberName: String): CompiledValue? {
|
||||||
for (cls in receiverClass.mro) {
|
return resolveExtensionSlotByReceiverNames(receiverClass, memberName, ::extensionPropertyGetterName)
|
||||||
val candidate = extensionPropertyGetterName(cls.className, memberName)
|
?: resolveUniqueExtensionWrapperSlot(memberName, "__ext_get__")
|
||||||
if (allowedScopeNames != null &&
|
|
||||||
!allowedScopeNames.contains(candidate) &&
|
|
||||||
!localSlotIndexByName.containsKey(candidate)
|
|
||||||
) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
resolveDirectNameSlot(candidate)?.let { return it }
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resolveExtensionSetterSlot(receiverClass: ObjClass, memberName: String): CompiledValue? {
|
private fun resolveExtensionSetterSlot(receiverClass: ObjClass, memberName: String): CompiledValue? {
|
||||||
for (cls in receiverClass.mro) {
|
return resolveExtensionSlotByReceiverNames(receiverClass, memberName, ::extensionPropertySetterName)
|
||||||
val candidate = extensionPropertySetterName(cls.className, memberName)
|
?: resolveUniqueExtensionWrapperSlot(memberName, "__ext_set__")
|
||||||
if (allowedScopeNames != null &&
|
|
||||||
!allowedScopeNames.contains(candidate) &&
|
|
||||||
!localSlotIndexByName.containsKey(candidate)
|
|
||||||
) {
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
resolveDirectNameSlot(candidate)?.let { return it }
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun compileCallArgsWithReceiver(
|
private fun compileCallArgsWithReceiver(
|
||||||
@@ -4870,10 +4908,14 @@ class BytecodeCompiler(
|
|||||||
return CallArgs(base = argSlots[0], count = argSlots.size, planId = planId)
|
return CallArgs(base = argSlots[0], count = argSlots.size, planId = planId)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun compileCallArgs(args: List<ParsedArgument>, tailBlock: Boolean): CallArgs? {
|
private fun compileCallArgs(
|
||||||
if (args.isEmpty()) return CallArgs(base = 0, count = 0, planId = null)
|
args: List<ParsedArgument>,
|
||||||
|
tailBlock: Boolean,
|
||||||
|
explicitTypeArgs: List<TypeDecl>? = null
|
||||||
|
): CallArgs? {
|
||||||
|
if (args.isEmpty() && explicitTypeArgs.isNullOrEmpty()) return CallArgs(base = 0, count = 0, planId = null)
|
||||||
val argSlots = IntArray(args.size) { allocSlot() }
|
val argSlots = IntArray(args.size) { allocSlot() }
|
||||||
val needPlan = tailBlock || args.any { it.isSplat || it.name != null }
|
val needPlan = tailBlock || args.any { it.isSplat || it.name != null } || !explicitTypeArgs.isNullOrEmpty()
|
||||||
val specs = if (needPlan) ArrayList<BytecodeConst.CallArgSpec>(args.size) else null
|
val specs = if (needPlan) ArrayList<BytecodeConst.CallArgSpec>(args.size) else null
|
||||||
for ((index, arg) in args.withIndex()) {
|
for ((index, arg) in args.withIndex()) {
|
||||||
val compiled = compileArgValue(arg.value) ?: return null
|
val compiled = compileArgValue(arg.value) ?: return null
|
||||||
@@ -4885,11 +4927,17 @@ class BytecodeCompiler(
|
|||||||
specs?.add(BytecodeConst.CallArgSpec(arg.name, arg.isSplat))
|
specs?.add(BytecodeConst.CallArgSpec(arg.name, arg.isSplat))
|
||||||
}
|
}
|
||||||
val planId = if (needPlan) {
|
val planId = if (needPlan) {
|
||||||
builder.addConst(BytecodeConst.CallArgsPlan(tailBlock, specs ?: emptyList()))
|
builder.addConst(
|
||||||
|
BytecodeConst.CallArgsPlan(
|
||||||
|
tailBlock = tailBlock,
|
||||||
|
specs = specs ?: emptyList(),
|
||||||
|
explicitTypeArgs = explicitTypeArgs ?: emptyList()
|
||||||
|
)
|
||||||
|
)
|
||||||
} else {
|
} else {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
return CallArgs(base = argSlots[0], count = argSlots.size, planId = planId)
|
return CallArgs(base = if (argSlots.isEmpty()) 0 else argSlots[0], count = argSlots.size, planId = planId)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun compileArgValue(value: Obj): CompiledValue? {
|
private fun compileArgValue(value: Obj): CompiledValue? {
|
||||||
@@ -5173,6 +5221,7 @@ class BytecodeCompiler(
|
|||||||
isMutable = stmt.isMutable,
|
isMutable = stmt.isMutable,
|
||||||
visibility = stmt.visibility,
|
visibility = stmt.visibility,
|
||||||
writeVisibility = stmt.writeVisibility,
|
writeVisibility = stmt.writeVisibility,
|
||||||
|
typeDecl = stmt.typeDecl,
|
||||||
isTransient = stmt.isTransient,
|
isTransient = stmt.isTransient,
|
||||||
isAbstract = stmt.isAbstract,
|
isAbstract = stmt.isAbstract,
|
||||||
isClosed = stmt.isClosed,
|
isClosed = stmt.isClosed,
|
||||||
@@ -6997,7 +7046,9 @@ class BytecodeCompiler(
|
|||||||
val slot = resolveSlot(ref)
|
val slot = resolveSlot(ref)
|
||||||
val fromSlot = slot?.let { slotObjClass[it] }
|
val fromSlot = slot?.let { slotObjClass[it] }
|
||||||
fromSlot
|
fromSlot
|
||||||
|
?: slot?.let { typeDeclForSlot(it) }?.let { resolveClassFromTypeDecl(it) }
|
||||||
?: slotTypeByScopeId[ownerScopeId]?.get(ownerSlot)
|
?: slotTypeByScopeId[ownerScopeId]?.get(ownerSlot)
|
||||||
|
?: slotTypeDeclByScopeId[ownerScopeId]?.get(ownerSlot)?.let { resolveClassFromTypeDecl(it) }
|
||||||
?: nameObjClass[ref.name]
|
?: nameObjClass[ref.name]
|
||||||
?: resolveTypeNameClass(ref.name)
|
?: resolveTypeNameClass(ref.name)
|
||||||
?: slotInitClassByKey[ScopeSlotKey(ownerScopeId, ownerSlot)]
|
?: slotInitClassByKey[ScopeSlotKey(ownerScopeId, ownerSlot)]
|
||||||
@@ -7015,9 +7066,14 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
val fromSlot = resolveDirectNameSlot(ref.name)?.let { slotObjClass[it.slot] }
|
val fromSlot = resolveDirectNameSlot(ref.name)?.let { slotObjClass[it.slot] }
|
||||||
if (fromSlot != null) return fromSlot
|
if (fromSlot != null) return fromSlot
|
||||||
|
val fromDirectTypeDecl = resolveDirectNameSlot(ref.name)
|
||||||
|
?.let { typeDeclForSlot(it.slot) }
|
||||||
|
?.let { resolveClassFromTypeDecl(it) }
|
||||||
|
if (fromDirectTypeDecl != null) return fromDirectTypeDecl
|
||||||
val key = localSlotInfoMap.entries.firstOrNull { it.value.name == ref.name }?.key
|
val key = localSlotInfoMap.entries.firstOrNull { it.value.name == ref.name }?.key
|
||||||
key?.let {
|
key?.let {
|
||||||
slotTypeByScopeId[it.scopeId]?.get(it.slot)
|
slotTypeByScopeId[it.scopeId]?.get(it.slot)
|
||||||
|
?: slotTypeDeclByScopeId[it.scopeId]?.get(it.slot)?.let { decl -> resolveClassFromTypeDecl(decl) }
|
||||||
?: slotInitClassByKey[it]
|
?: slotInitClassByKey[it]
|
||||||
} ?: nameObjClass[ref.name]
|
} ?: nameObjClass[ref.name]
|
||||||
?: resolveTypeNameClass(ref.name)
|
?: resolveTypeNameClass(ref.name)
|
||||||
@@ -7028,9 +7084,14 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
val fromSlot = resolveDirectNameSlot(ref.name)?.let { slotObjClass[it.slot] }
|
val fromSlot = resolveDirectNameSlot(ref.name)?.let { slotObjClass[it.slot] }
|
||||||
if (fromSlot != null) return fromSlot
|
if (fromSlot != null) return fromSlot
|
||||||
|
val fromDirectTypeDecl = resolveDirectNameSlot(ref.name)
|
||||||
|
?.let { typeDeclForSlot(it.slot) }
|
||||||
|
?.let { resolveClassFromTypeDecl(it) }
|
||||||
|
if (fromDirectTypeDecl != null) return fromDirectTypeDecl
|
||||||
val key = localSlotInfoMap.entries.firstOrNull { it.value.name == ref.name }?.key
|
val key = localSlotInfoMap.entries.firstOrNull { it.value.name == ref.name }?.key
|
||||||
key?.let {
|
key?.let {
|
||||||
slotTypeByScopeId[it.scopeId]?.get(it.slot)
|
slotTypeByScopeId[it.scopeId]?.get(it.slot)
|
||||||
|
?: slotTypeDeclByScopeId[it.scopeId]?.get(it.slot)?.let { decl -> resolveClassFromTypeDecl(decl) }
|
||||||
?: slotInitClassByKey[it]
|
?: slotInitClassByKey[it]
|
||||||
} ?: nameObjClass[ref.name]
|
} ?: nameObjClass[ref.name]
|
||||||
?: resolveTypeNameClass(ref.name)
|
?: resolveTypeNameClass(ref.name)
|
||||||
@@ -7072,6 +7133,23 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun resolveClassFromTypeDecl(typeDecl: TypeDecl): ObjClass? {
|
||||||
|
return when (typeDecl) {
|
||||||
|
is TypeDecl.Simple -> {
|
||||||
|
resolveTypeNameClass(typeDecl.name) ?: nameObjClass[typeDecl.name]?.let { cls ->
|
||||||
|
if (cls == ObjClassType) ObjDynamic.type else cls
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is TypeDecl.Generic -> {
|
||||||
|
resolveTypeNameClass(typeDecl.name) ?: nameObjClass[typeDecl.name]?.let { cls ->
|
||||||
|
if (cls == ObjClassType) ObjDynamic.type else cls
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is TypeDecl.Ellipsis -> resolveClassFromTypeDecl(typeDecl.elementType)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
private fun isKnownClassReceiver(ref: ObjRef): Boolean {
|
private fun isKnownClassReceiver(ref: ObjRef): Boolean {
|
||||||
return when (ref) {
|
return when (ref) {
|
||||||
is LocalVarRef -> {
|
is LocalVarRef -> {
|
||||||
@@ -7273,8 +7351,11 @@ class BytecodeCompiler(
|
|||||||
"Bool" -> ObjBool.type
|
"Bool" -> ObjBool.type
|
||||||
"Char" -> ObjChar.type
|
"Char" -> ObjChar.type
|
||||||
"List" -> ObjList.type
|
"List" -> ObjList.type
|
||||||
|
"ImmutableList" -> ObjImmutableList.type
|
||||||
"Map" -> ObjMap.type
|
"Map" -> ObjMap.type
|
||||||
|
"ImmutableMap" -> ObjImmutableMap.type
|
||||||
"Set" -> ObjSet.type
|
"Set" -> ObjSet.type
|
||||||
|
"ImmutableSet" -> ObjImmutableSet.type
|
||||||
"Range", "IntRange" -> ObjRange.type
|
"Range", "IntRange" -> ObjRange.type
|
||||||
"Iterator" -> ObjIterator
|
"Iterator" -> ObjIterator
|
||||||
"Iterable" -> ObjIterable
|
"Iterable" -> ObjIterable
|
||||||
@@ -7288,6 +7369,16 @@ class BytecodeCompiler(
|
|||||||
"Regex" -> ObjRegex.type
|
"Regex" -> ObjRegex.type
|
||||||
"RegexMatch" -> ObjRegexMatch.type
|
"RegexMatch" -> ObjRegexMatch.type
|
||||||
"MapEntry" -> ObjMapEntry.type
|
"MapEntry" -> ObjMapEntry.type
|
||||||
|
"Observable" -> ObjObservable
|
||||||
|
"Subscription" -> ObjSubscription.type
|
||||||
|
"ListChange" -> ObjListChange.type
|
||||||
|
"ListSet" -> ObjListSetChange.type
|
||||||
|
"ListInsert" -> ObjListInsertChange.type
|
||||||
|
"ListRemove" -> ObjListRemoveChange.type
|
||||||
|
"ListClear" -> ObjListClearChange.type
|
||||||
|
"ListReorder" -> ObjListReorderChange.type
|
||||||
|
"ObservableList" -> ObjObservableList.type
|
||||||
|
"ChangeRejectionException" -> ObjChangeRejectionExceptionClass
|
||||||
"Instant" -> ObjInstant.type
|
"Instant" -> ObjInstant.type
|
||||||
"DateTime" -> ObjDateTime.type
|
"DateTime" -> ObjDateTime.type
|
||||||
"Duration" -> ObjDuration.type
|
"Duration" -> ObjDuration.type
|
||||||
@@ -7348,7 +7439,12 @@ class BytecodeCompiler(
|
|||||||
"iterator" -> ObjIterator
|
"iterator" -> ObjIterator
|
||||||
"count" -> ObjInt.type
|
"count" -> ObjInt.type
|
||||||
"toSet" -> ObjSet.type
|
"toSet" -> ObjSet.type
|
||||||
|
"toImmutableSet" -> ObjImmutableSet.type
|
||||||
"toMap" -> ObjMap.type
|
"toMap" -> ObjMap.type
|
||||||
|
"toImmutableMap" -> ObjImmutableMap.type
|
||||||
|
"observable" -> ObjObservableList.type
|
||||||
|
"beforeChange", "onChange" -> ObjSubscription.type
|
||||||
|
"changes" -> ObjFlow.type
|
||||||
"joinToString" -> ObjString.type
|
"joinToString" -> ObjString.type
|
||||||
"now",
|
"now",
|
||||||
"truncateToSecond",
|
"truncateToSecond",
|
||||||
@@ -7375,6 +7471,8 @@ class BytecodeCompiler(
|
|||||||
"matches" -> ObjBool.type
|
"matches" -> ObjBool.type
|
||||||
"toInt",
|
"toInt",
|
||||||
"toEpochSeconds" -> ObjInt.type
|
"toEpochSeconds" -> ObjInt.type
|
||||||
|
"toImmutableList" -> ObjImmutableList.type
|
||||||
|
"toImmutable" -> Obj.rootObjectType
|
||||||
"toMutable" -> ObjMutableBuffer.type
|
"toMutable" -> ObjMutableBuffer.type
|
||||||
"seq" -> ObjFlow.type
|
"seq" -> ObjFlow.type
|
||||||
"encode" -> ObjBitBuffer.type
|
"encode" -> ObjBitBuffer.type
|
||||||
@@ -7386,7 +7484,7 @@ class BytecodeCompiler(
|
|||||||
if (targetClass == null) return null
|
if (targetClass == null) return null
|
||||||
if (targetClass == ObjDynamic.type) return ObjDynamic.type
|
if (targetClass == ObjDynamic.type) return ObjDynamic.type
|
||||||
classFieldTypesByName[targetClass.className]?.get(name)?.let { cls ->
|
classFieldTypesByName[targetClass.className]?.get(name)?.let { cls ->
|
||||||
if (cls.className == "Delegate" || cls.className == "LazyDelegate" || cls.implementingNames.contains("Delegate")) {
|
if (isDelegateClass(cls)) {
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
return cls
|
return cls
|
||||||
@@ -7473,8 +7571,8 @@ class BytecodeCompiler(
|
|||||||
|
|
||||||
private fun queueExtensionCallableNames(receiverClass: ObjClass, memberName: String) {
|
private fun queueExtensionCallableNames(receiverClass: ObjClass, memberName: String) {
|
||||||
if (!useScopeSlots && globalSlotInfo.isEmpty()) return
|
if (!useScopeSlots && globalSlotInfo.isEmpty()) return
|
||||||
for (cls in receiverClass.mro) {
|
for (receiverName in extensionReceiverTypeNames(receiverClass)) {
|
||||||
val name = extensionCallableName(cls.className, memberName)
|
val name = extensionCallableName(receiverName, memberName)
|
||||||
if (allowedScopeNames == null || allowedScopeNames.contains(name)) {
|
if (allowedScopeNames == null || allowedScopeNames.contains(name)) {
|
||||||
pendingScopeNameRefs.add(name)
|
pendingScopeNameRefs.add(name)
|
||||||
}
|
}
|
||||||
@@ -7483,12 +7581,12 @@ class BytecodeCompiler(
|
|||||||
|
|
||||||
private fun queueExtensionPropertyNames(receiverClass: ObjClass, memberName: String) {
|
private fun queueExtensionPropertyNames(receiverClass: ObjClass, memberName: String) {
|
||||||
if (!useScopeSlots && globalSlotInfo.isEmpty()) return
|
if (!useScopeSlots && globalSlotInfo.isEmpty()) return
|
||||||
for (cls in receiverClass.mro) {
|
for (receiverName in extensionReceiverTypeNames(receiverClass)) {
|
||||||
val getter = extensionPropertyGetterName(cls.className, memberName)
|
val getter = extensionPropertyGetterName(receiverName, memberName)
|
||||||
if (allowedScopeNames == null || allowedScopeNames.contains(getter)) {
|
if (allowedScopeNames == null || allowedScopeNames.contains(getter)) {
|
||||||
pendingScopeNameRefs.add(getter)
|
pendingScopeNameRefs.add(getter)
|
||||||
}
|
}
|
||||||
val setter = extensionPropertySetterName(cls.className, memberName)
|
val setter = extensionPropertySetterName(receiverName, memberName)
|
||||||
if (allowedScopeNames == null || allowedScopeNames.contains(setter)) {
|
if (allowedScopeNames == null || allowedScopeNames.contains(setter)) {
|
||||||
pendingScopeNameRefs.add(setter)
|
pendingScopeNameRefs.add(setter)
|
||||||
}
|
}
|
||||||
@@ -7694,7 +7792,7 @@ class BytecodeCompiler(
|
|||||||
for (ref in valueFnRefs) {
|
for (ref in valueFnRefs) {
|
||||||
val entries = lambdaCaptureEntriesByRef[ref] ?: continue
|
val entries = lambdaCaptureEntriesByRef[ref] ?: continue
|
||||||
for (entry in entries) {
|
for (entry in entries) {
|
||||||
if (entry.ownerKind != CaptureOwnerFrameKind.LOCAL) continue
|
if (entry.ownerKind == CaptureOwnerFrameKind.LOCAL) {
|
||||||
val key = ScopeSlotKey(entry.ownerScopeId, entry.ownerSlotId)
|
val key = ScopeSlotKey(entry.ownerScopeId, entry.ownerSlotId)
|
||||||
if (!localSlotInfoMap.containsKey(key)) {
|
if (!localSlotInfoMap.containsKey(key)) {
|
||||||
localSlotInfoMap[key] = LocalSlotInfo(
|
localSlotInfoMap[key] = LocalSlotInfo(
|
||||||
@@ -7703,6 +7801,20 @@ class BytecodeCompiler(
|
|||||||
entry.ownerIsDelegated
|
entry.ownerIsDelegated
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (entry.ownerKind == CaptureOwnerFrameKind.MODULE) {
|
||||||
|
val key = ScopeSlotKey(entry.ownerScopeId, entry.ownerSlotId)
|
||||||
|
if (!scopeSlotMap.containsKey(key)) {
|
||||||
|
scopeSlotMap[key] = scopeSlotMap.size
|
||||||
|
}
|
||||||
|
if (!scopeSlotNameMap.containsKey(key)) {
|
||||||
|
scopeSlotNameMap[key] = entry.ownerName
|
||||||
|
}
|
||||||
|
if (!scopeSlotMutableMap.containsKey(key)) {
|
||||||
|
scopeSlotMutableMap[key] = entry.ownerIsMutable
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -8170,7 +8282,8 @@ class BytecodeCompiler(
|
|||||||
}
|
}
|
||||||
|
|
||||||
private fun isModuleSlot(scopeId: Int, name: String?): Boolean {
|
private fun isModuleSlot(scopeId: Int, name: String?): Boolean {
|
||||||
val scopeNames = scopeSlotNameSet ?: allowedScopeNames
|
if (moduleScopeId != null && scopeId != moduleScopeId) return false
|
||||||
|
val scopeNames = allowedScopeNames ?: scopeSlotNameSet
|
||||||
if (scopeNames == null || name == null) return false
|
if (scopeNames == null || name == null) return false
|
||||||
return scopeNames.contains(name)
|
return scopeNames.contains(name)
|
||||||
}
|
}
|
||||||
@@ -8393,6 +8506,9 @@ class BytecodeCompiler(
|
|||||||
collectScopeSlotsRef(ref.targetRef)
|
collectScopeSlotsRef(ref.targetRef)
|
||||||
collectScopeSlotsRef(ref.indexRef)
|
collectScopeSlotsRef(ref.indexRef)
|
||||||
}
|
}
|
||||||
|
is ClassOperatorRef -> {
|
||||||
|
collectScopeSlotsRef(ref.target)
|
||||||
|
}
|
||||||
is ListLiteralRef -> {
|
is ListLiteralRef -> {
|
||||||
for (entry in ref.entries()) {
|
for (entry in ref.entries()) {
|
||||||
when (entry) {
|
when (entry) {
|
||||||
|
|||||||
@@ -100,6 +100,7 @@ sealed class BytecodeConst {
|
|||||||
val isMutable: Boolean,
|
val isMutable: Boolean,
|
||||||
val visibility: Visibility,
|
val visibility: Visibility,
|
||||||
val writeVisibility: Visibility?,
|
val writeVisibility: Visibility?,
|
||||||
|
val typeDecl: TypeDecl?,
|
||||||
val isTransient: Boolean,
|
val isTransient: Boolean,
|
||||||
val isAbstract: Boolean,
|
val isAbstract: Boolean,
|
||||||
val isClosed: Boolean,
|
val isClosed: Boolean,
|
||||||
@@ -179,6 +180,10 @@ sealed class BytecodeConst {
|
|||||||
val pattern: ListLiteralRef,
|
val pattern: ListLiteralRef,
|
||||||
val pos: Pos,
|
val pos: Pos,
|
||||||
) : BytecodeConst()
|
) : BytecodeConst()
|
||||||
data class CallArgsPlan(val tailBlock: Boolean, val specs: List<CallArgSpec>) : BytecodeConst()
|
data class CallArgsPlan(
|
||||||
|
val tailBlock: Boolean,
|
||||||
|
val specs: List<CallArgSpec>,
|
||||||
|
val explicitTypeArgs: List<TypeDecl> = emptyList()
|
||||||
|
) : BytecodeConst()
|
||||||
data class CallArgSpec(val name: String?, val isSplat: Boolean)
|
data class CallArgSpec(val name: String?, val isSplat: Boolean)
|
||||||
}
|
}
|
||||||
@@ -34,6 +34,17 @@ class BytecodeFrame(
|
|||||||
private val realSlots: DoubleArray = DoubleArray(slotCount)
|
private val realSlots: DoubleArray = DoubleArray(slotCount)
|
||||||
private val boolSlots: BooleanArray = BooleanArray(slotCount)
|
private val boolSlots: BooleanArray = BooleanArray(slotCount)
|
||||||
|
|
||||||
|
internal fun copyTo(target: BytecodeFrame) {
|
||||||
|
val limit = minOf(slotCount, target.slotCount)
|
||||||
|
for (i in 0 until limit) {
|
||||||
|
target.slotTypes[i] = slotTypes[i]
|
||||||
|
target.objSlots[i] = objSlots[i]
|
||||||
|
target.intSlots[i] = intSlots[i]
|
||||||
|
target.realSlots[i] = realSlots[i]
|
||||||
|
target.boolSlots[i] = boolSlots[i]
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun getSlotType(slot: Int): SlotType = SlotType.values().first { it.code == slotTypes[slot] }
|
fun getSlotType(slot: Int): SlotType = SlotType.values().first { it.code == slotTypes[slot] }
|
||||||
override fun getSlotTypeCode(slot: Int): Byte = slotTypes[slot]
|
override fun getSlotTypeCode(slot: Int): Byte = slotTypes[slot]
|
||||||
fun setSlotType(slot: Int, type: SlotType) {
|
fun setSlotType(slot: Int, type: SlotType) {
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ package net.sergeych.lyng.bytecode
|
|||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.*
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjClass
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
import net.sergeych.lyng.obj.ValueFnRef
|
import net.sergeych.lyng.obj.ValueFnRef
|
||||||
|
|
||||||
class BytecodeStatement private constructor(
|
class BytecodeStatement private constructor(
|
||||||
@@ -30,7 +31,34 @@ class BytecodeStatement private constructor(
|
|||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
scope.pos = pos
|
scope.pos = pos
|
||||||
return CmdVm().execute(function, scope, scope.args)
|
val declaredNames = function.constants
|
||||||
|
.mapNotNull { it as? BytecodeConst.LocalDecl }
|
||||||
|
.mapTo(mutableSetOf()) { it.name }
|
||||||
|
val binder: suspend (CmdFrame, Arguments) -> Unit = { frame, _ ->
|
||||||
|
val localNames = frame.fn.localSlotNames
|
||||||
|
for (i in localNames.indices) {
|
||||||
|
val name = localNames[i] ?: continue
|
||||||
|
if (declaredNames.contains(name)) continue
|
||||||
|
val slotType = frame.getLocalSlotTypeCode(i)
|
||||||
|
if (slotType != SlotType.UNKNOWN.code && slotType != SlotType.OBJ.code) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (slotType == SlotType.OBJ.code && frame.frame.getRawObj(i) != null) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val record = scope.getLocalRecordDirect(name)
|
||||||
|
?: scope.parent?.get(name)
|
||||||
|
?: scope.get(name)
|
||||||
|
?: continue
|
||||||
|
val value = if (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property) {
|
||||||
|
scope.resolve(record, name)
|
||||||
|
} else {
|
||||||
|
record.value
|
||||||
|
}
|
||||||
|
frame.frame.setObj(i, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return CmdVm().execute(function, scope, scope.args, binder)
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun bytecodeFunction(): CmdFunction = function
|
internal fun bytecodeFunction(): CmdFunction = function
|
||||||
@@ -52,6 +80,7 @@ class BytecodeStatement private constructor(
|
|||||||
globalSlotScopeId: Int? = null,
|
globalSlotScopeId: Int? = null,
|
||||||
slotTypeByScopeId: Map<Int, Map<Int, ObjClass>> = emptyMap(),
|
slotTypeByScopeId: Map<Int, Map<Int, ObjClass>> = emptyMap(),
|
||||||
knownNameObjClass: Map<String, ObjClass> = emptyMap(),
|
knownNameObjClass: Map<String, ObjClass> = emptyMap(),
|
||||||
|
knownClassNames: Set<String> = emptySet(),
|
||||||
knownObjectNames: Set<String> = emptySet(),
|
knownObjectNames: Set<String> = emptySet(),
|
||||||
classFieldTypesByName: Map<String, Map<String, ObjClass>> = emptyMap(),
|
classFieldTypesByName: Map<String, Map<String, ObjClass>> = emptyMap(),
|
||||||
enumEntriesByName: Map<String, List<String>> = emptyMap(),
|
enumEntriesByName: Map<String, List<String>> = emptyMap(),
|
||||||
@@ -86,6 +115,7 @@ class BytecodeStatement private constructor(
|
|||||||
slotTypeByScopeId = slotTypeByScopeId,
|
slotTypeByScopeId = slotTypeByScopeId,
|
||||||
slotTypeDeclByScopeId = slotTypeDeclByScopeId,
|
slotTypeDeclByScopeId = slotTypeDeclByScopeId,
|
||||||
knownNameObjClass = knownNameObjClass,
|
knownNameObjClass = knownNameObjClass,
|
||||||
|
knownClassNames = knownClassNames,
|
||||||
knownObjectNames = knownObjectNames,
|
knownObjectNames = knownObjectNames,
|
||||||
classFieldTypesByName = classFieldTypesByName,
|
classFieldTypesByName = classFieldTypesByName,
|
||||||
enumEntriesByName = enumEntriesByName,
|
enumEntriesByName = enumEntriesByName,
|
||||||
@@ -318,6 +348,7 @@ class BytecodeStatement private constructor(
|
|||||||
stmt.isMutable,
|
stmt.isMutable,
|
||||||
stmt.visibility,
|
stmt.visibility,
|
||||||
stmt.writeVisibility,
|
stmt.writeVisibility,
|
||||||
|
stmt.typeDecl,
|
||||||
stmt.isAbstract,
|
stmt.isAbstract,
|
||||||
stmt.isClosed,
|
stmt.isClosed,
|
||||||
stmt.isOverride,
|
stmt.isOverride,
|
||||||
@@ -412,6 +443,7 @@ class BytecodeStatement private constructor(
|
|||||||
is WhenEqualsCondition -> WhenEqualsCondition(unwrapDeep(cond.expr), cond.pos)
|
is WhenEqualsCondition -> WhenEqualsCondition(unwrapDeep(cond.expr), cond.pos)
|
||||||
is WhenInCondition -> WhenInCondition(unwrapDeep(cond.expr), cond.negated, cond.pos)
|
is WhenInCondition -> WhenInCondition(unwrapDeep(cond.expr), cond.negated, cond.pos)
|
||||||
is WhenIsCondition -> WhenIsCondition(unwrapDeep(cond.expr), cond.negated, cond.pos)
|
is WhenIsCondition -> WhenIsCondition(unwrapDeep(cond.expr), cond.negated, cond.pos)
|
||||||
|
is WhenNullableCondition -> WhenNullableCondition(cond.negated, cond.pos)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -229,8 +229,29 @@ class CmdLoadThisVariant(
|
|||||||
val typeConst = frame.fn.constants.getOrNull(typeId) as? BytecodeConst.StringVal
|
val typeConst = frame.fn.constants.getOrNull(typeId) as? BytecodeConst.StringVal
|
||||||
?: error("LOAD_THIS_VARIANT expects StringVal at $typeId")
|
?: error("LOAD_THIS_VARIANT expects StringVal at $typeId")
|
||||||
val typeName = typeConst.value
|
val typeName = typeConst.value
|
||||||
val receiver = frame.ensureScope().thisVariants.firstOrNull { it.isInstanceOf(typeName) }
|
val scope = frame.ensureScope()
|
||||||
?: frame.ensureScope().raiseClassCastError("Cannot cast ${frame.ensureScope().thisObj.objClass.className} to $typeName")
|
if (scope.thisVariants.isEmpty() || scope.thisVariants.firstOrNull() !== scope.thisObj) {
|
||||||
|
scope.setThisVariants(scope.thisObj, scope.thisVariants)
|
||||||
|
}
|
||||||
|
val receiver = scope.thisVariants.firstOrNull { it.isInstanceOf(typeName) }
|
||||||
|
?: run {
|
||||||
|
if (scope.thisObj.isInstanceOf(typeName)) return@run scope.thisObj
|
||||||
|
val typeClass = scope[typeName]?.value as? net.sergeych.lyng.obj.ObjClass
|
||||||
|
var s: Scope? = scope
|
||||||
|
while (s != null) {
|
||||||
|
val candidate = s.thisObj
|
||||||
|
if (candidate.isInstanceOf(typeName)) return@run candidate
|
||||||
|
if (typeClass != null) {
|
||||||
|
val inst = candidate as? net.sergeych.lyng.obj.ObjInstance
|
||||||
|
if (inst != null && (inst.objClass === typeClass || inst.objClass.allParentsSet.contains(typeClass))) {
|
||||||
|
return@run inst
|
||||||
|
}
|
||||||
|
}
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
val variants = scope.thisVariants.joinToString { it.objClass.className }
|
||||||
|
scope.raiseClassCastError("Cannot cast ${scope.thisObj.objClass.className} to $typeName (variants: $variants)")
|
||||||
|
}
|
||||||
frame.setObj(dst, receiver)
|
frame.setObj(dst, receiver)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -2398,12 +2419,10 @@ class CmdDeclLocal(internal val constId: Int, internal val slot: Int) : Cmd() {
|
|||||||
)
|
)
|
||||||
val moduleScope = frame.scope as? ModuleScope
|
val moduleScope = frame.scope as? ModuleScope
|
||||||
if (moduleScope != null) {
|
if (moduleScope != null) {
|
||||||
moduleScope.updateSlotFor(decl.name, record)
|
|
||||||
moduleScope.objects[decl.name] = record
|
moduleScope.objects[decl.name] = record
|
||||||
moduleScope.localBindings[decl.name] = record
|
moduleScope.localBindings[decl.name] = record
|
||||||
} else if (frame.fn.name == "<script>") {
|
} else if (frame.fn.name == "<script>") {
|
||||||
val target = frame.ensureScope()
|
val target = frame.ensureScope()
|
||||||
target.updateSlotFor(decl.name, record)
|
|
||||||
target.objects[decl.name] = record
|
target.objects[decl.name] = record
|
||||||
target.localBindings[decl.name] = record
|
target.localBindings[decl.name] = record
|
||||||
}
|
}
|
||||||
@@ -2540,6 +2559,12 @@ private fun buildFunctionCaptureRecords(frame: CmdFrame, captureNames: List<Stri
|
|||||||
it.delegate = delegate
|
it.delegate = delegate
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
val raw = frame.frame.getRawObj(localIndex)
|
||||||
|
val scoped = frame.scope.chainLookupIgnoreClosure(name, followClosure = true) ?: frame.scope.get(name)
|
||||||
|
if (scoped != null && scoped.value !== ObjUnset) {
|
||||||
|
records += scoped
|
||||||
|
continue
|
||||||
|
}
|
||||||
records += ObjRecord(FrameSlotRef(frame.frame, localIndex), isMutable)
|
records += ObjRecord(FrameSlotRef(frame.frame, localIndex), isMutable)
|
||||||
}
|
}
|
||||||
continue
|
continue
|
||||||
@@ -2563,6 +2588,11 @@ private fun buildFunctionCaptureRecords(frame: CmdFrame, captureNames: List<Stri
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
val scoped = frame.scope.chainLookupIgnoreClosure(name, followClosure = true) ?: frame.scope.get(name)
|
||||||
|
if (scoped != null) {
|
||||||
|
records += ObjRecord(RecordSlotRef(scoped), isMutable = scoped.isMutable)
|
||||||
|
continue
|
||||||
|
}
|
||||||
frame.ensureScope().raiseSymbolNotFound("capture $name not found")
|
frame.ensureScope().raiseSymbolNotFound("capture $name not found")
|
||||||
}
|
}
|
||||||
return records
|
return records
|
||||||
@@ -2579,6 +2609,17 @@ class CmdDeclClass(internal val constId: Int, internal val slot: Int) : Cmd() {
|
|||||||
val bodyCaptureRecords = buildFunctionCaptureRecords(frame, bodyCaptureNames)
|
val bodyCaptureRecords = buildFunctionCaptureRecords(frame, bodyCaptureNames)
|
||||||
val result = executeClassDecl(frame.ensureScope(), decl.spec, bodyCaptureRecords, bodyCaptureNames)
|
val result = executeClassDecl(frame.ensureScope(), decl.spec, bodyCaptureRecords, bodyCaptureNames)
|
||||||
frame.setObjUnchecked(slot, result)
|
frame.setObjUnchecked(slot, result)
|
||||||
|
val name = decl.spec.declaredName ?: return
|
||||||
|
val moduleScope = frame.scope as? ModuleScope ?: return
|
||||||
|
val record = ObjRecord(
|
||||||
|
result,
|
||||||
|
isMutable = false,
|
||||||
|
visibility = net.sergeych.lyng.Visibility.Public,
|
||||||
|
type = ObjRecord.Type.Other
|
||||||
|
)
|
||||||
|
moduleScope.updateSlotFor(name, record)
|
||||||
|
moduleScope.objects[name] = record
|
||||||
|
moduleScope.localBindings[name] = record
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -2709,6 +2750,7 @@ class CmdDeclClassInstanceField(internal val constId: Int, internal val slot: In
|
|||||||
isClosed = decl.isClosed,
|
isClosed = decl.isClosed,
|
||||||
isOverride = decl.isOverride,
|
isOverride = decl.isOverride,
|
||||||
isTransient = decl.isTransient,
|
isTransient = decl.isTransient,
|
||||||
|
typeDecl = decl.typeDecl,
|
||||||
type = ObjRecord.Type.Field,
|
type = ObjRecord.Type.Field,
|
||||||
fieldId = decl.fieldId
|
fieldId = decl.fieldId
|
||||||
)
|
)
|
||||||
@@ -3229,6 +3271,7 @@ class CmdGetMemberSlot(
|
|||||||
internal val dst: Int,
|
internal val dst: Int,
|
||||||
) : Cmd() {
|
) : Cmd() {
|
||||||
override suspend fun perform(frame: CmdFrame) {
|
override suspend fun perform(frame: CmdFrame) {
|
||||||
|
val scope = frame.ensureScope()
|
||||||
val receiver = frame.slotToObj(recvSlot)
|
val receiver = frame.slotToObj(recvSlot)
|
||||||
val inst = receiver as? ObjInstance
|
val inst = receiver as? ObjInstance
|
||||||
val cls = receiver as? ObjClass
|
val cls = receiver as? ObjClass
|
||||||
@@ -3251,7 +3294,26 @@ class CmdGetMemberSlot(
|
|||||||
else -> receiver.objClass.methodRecordForId(methodIdResolved)
|
else -> receiver.objClass.methodRecordForId(methodIdResolved)
|
||||||
}
|
}
|
||||||
} else null
|
} else null
|
||||||
} ?: frame.ensureScope().raiseSymbolNotFound("member")
|
} ?: run {
|
||||||
|
val receiverClass = when {
|
||||||
|
cls != null && fieldOnObjClass -> cls.objClass
|
||||||
|
cls != null -> cls
|
||||||
|
else -> receiver.objClass
|
||||||
|
}
|
||||||
|
val fieldName = if (fieldIdResolved >= 0) {
|
||||||
|
receiverClass.fieldSlotMap().entries.firstOrNull { it.value.slot == fieldIdResolved }?.key
|
||||||
|
} else null
|
||||||
|
val methodName = if (methodIdResolved >= 0) {
|
||||||
|
receiverClass.methodSlotMap().entries.firstOrNull { it.value.slot == methodIdResolved }?.key
|
||||||
|
} else null
|
||||||
|
val memberName = fieldName ?: methodName
|
||||||
|
val message = if (memberName != null) {
|
||||||
|
"no such member: $memberName on ${receiverClass.className}"
|
||||||
|
} else {
|
||||||
|
"no such member slot (fieldId=$fieldIdResolved, methodId=$methodIdResolved) on ${receiverClass.className}"
|
||||||
|
}
|
||||||
|
scope.raiseError(message)
|
||||||
|
}
|
||||||
val rawName = rec.memberName ?: "<member>"
|
val rawName = rec.memberName ?: "<member>"
|
||||||
val name = if (receiver is ObjInstance && rawName.contains("::")) {
|
val name = if (receiver is ObjInstance && rawName.contains("::")) {
|
||||||
rawName.substringAfterLast("::")
|
rawName.substringAfterLast("::")
|
||||||
@@ -3283,6 +3345,7 @@ class CmdSetMemberSlot(
|
|||||||
internal val valueSlot: Int,
|
internal val valueSlot: Int,
|
||||||
) : Cmd() {
|
) : Cmd() {
|
||||||
override suspend fun perform(frame: CmdFrame) {
|
override suspend fun perform(frame: CmdFrame) {
|
||||||
|
val scope = frame.ensureScope()
|
||||||
val receiver = frame.slotToObj(recvSlot)
|
val receiver = frame.slotToObj(recvSlot)
|
||||||
val inst = receiver as? ObjInstance
|
val inst = receiver as? ObjInstance
|
||||||
val cls = receiver as? ObjClass
|
val cls = receiver as? ObjClass
|
||||||
@@ -3305,7 +3368,26 @@ class CmdSetMemberSlot(
|
|||||||
else -> receiver.objClass.methodRecordForId(methodIdResolved)
|
else -> receiver.objClass.methodRecordForId(methodIdResolved)
|
||||||
}
|
}
|
||||||
} else null
|
} else null
|
||||||
} ?: frame.ensureScope().raiseSymbolNotFound("member")
|
} ?: run {
|
||||||
|
val receiverClass = when {
|
||||||
|
cls != null && fieldOnObjClass -> cls.objClass
|
||||||
|
cls != null -> cls
|
||||||
|
else -> receiver.objClass
|
||||||
|
}
|
||||||
|
val fieldName = if (fieldIdResolved >= 0) {
|
||||||
|
receiverClass.fieldSlotMap().entries.firstOrNull { it.value.slot == fieldIdResolved }?.key
|
||||||
|
} else null
|
||||||
|
val methodName = if (methodIdResolved >= 0) {
|
||||||
|
receiverClass.methodSlotMap().entries.firstOrNull { it.value.slot == methodIdResolved }?.key
|
||||||
|
} else null
|
||||||
|
val memberName = fieldName ?: methodName
|
||||||
|
val message = if (memberName != null) {
|
||||||
|
"no such member: $memberName on ${receiverClass.className}"
|
||||||
|
} else {
|
||||||
|
"no such member slot (fieldId=$fieldIdResolved, methodId=$methodIdResolved) on ${receiverClass.className}"
|
||||||
|
}
|
||||||
|
scope.raiseError(message)
|
||||||
|
}
|
||||||
val rawName = rec.memberName ?: "<member>"
|
val rawName = rec.memberName ?: "<member>"
|
||||||
val name = if (receiver is ObjInstance && rawName.contains("::")) {
|
val name = if (receiver is ObjInstance && rawName.contains("::")) {
|
||||||
rawName.substringAfterLast("::")
|
rawName.substringAfterLast("::")
|
||||||
@@ -3568,6 +3650,20 @@ class BytecodeLambdaCallable(
|
|||||||
private val returnLabels: Set<String>,
|
private val returnLabels: Set<String>,
|
||||||
override val pos: Pos,
|
override val pos: Pos,
|
||||||
) : Statement(), BytecodeCallable {
|
) : Statement(), BytecodeCallable {
|
||||||
|
fun rebindClosure(newClosureScope: Scope): BytecodeLambdaCallable {
|
||||||
|
return BytecodeLambdaCallable(
|
||||||
|
fn = fn,
|
||||||
|
closureScope = newClosureScope,
|
||||||
|
captureRecords = captureRecords,
|
||||||
|
captureNames = captureNames,
|
||||||
|
paramSlotPlan = paramSlotPlan,
|
||||||
|
argsDeclaration = argsDeclaration,
|
||||||
|
preferredThisType = preferredThisType,
|
||||||
|
returnLabels = returnLabels,
|
||||||
|
pos = pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
val context = scope.applyClosureForBytecode(closureScope, preferredThisType).also {
|
val context = scope.applyClosureForBytecode(closureScope, preferredThisType).also {
|
||||||
it.args = scope.args
|
it.args = scope.args
|
||||||
@@ -3688,6 +3784,7 @@ class CmdFrame(
|
|||||||
val exceptionSlot: Int,
|
val exceptionSlot: Int,
|
||||||
val catchIp: Int,
|
val catchIp: Int,
|
||||||
val finallyIp: Int,
|
val finallyIp: Int,
|
||||||
|
val iterDepthAtPush: Int,
|
||||||
var inCatch: Boolean = false
|
var inCatch: Boolean = false
|
||||||
)
|
)
|
||||||
internal val tryStack = ArrayDeque<TryHandler>()
|
internal val tryStack = ArrayDeque<TryHandler>()
|
||||||
@@ -3715,6 +3812,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
|
|
||||||
internal fun getLocalSlotTypeCode(localIndex: Int): Byte = frame.getSlotTypeCode(localIndex)
|
internal fun getLocalSlotTypeCode(localIndex: Int): Byte = frame.getSlotTypeCode(localIndex)
|
||||||
|
internal fun readLocalObj(localIndex: Int): Obj = localSlotToObj(localIndex)
|
||||||
internal fun isFastLocalSlot(slot: Int): Boolean {
|
internal fun isFastLocalSlot(slot: Int): Boolean {
|
||||||
if (slot < fn.scopeSlotCount) return false
|
if (slot < fn.scopeSlotCount) return false
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
@@ -3850,10 +3948,26 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
CaptureOwnerFrameKind.MODULE -> {
|
CaptureOwnerFrameKind.MODULE -> {
|
||||||
val slot = entry.slotIndex
|
val slotId = entry.slotIndex
|
||||||
val target = scopeTarget(slot)
|
val target = moduleScope
|
||||||
val index = fn.scopeSlotIndices[slot]
|
val name = captureNames?.getOrNull(index)
|
||||||
target.getSlotRecord(index)
|
if (name != null) {
|
||||||
|
target.tryGetLocalRecord(target, name, target.currentClassCtx)?.let { return@mapIndexed it }
|
||||||
|
target.getSlotIndexOf(name)?.let { return@mapIndexed target.getSlotRecord(it) }
|
||||||
|
target.get(name)?.let { return@mapIndexed it }
|
||||||
|
// Fallback to current scope in case the module scope isn't in the parent chain
|
||||||
|
// or doesn't carry the imported symbol yet.
|
||||||
|
scope.tryGetLocalRecord(scope, name, scope.currentClassCtx)?.let { return@mapIndexed it }
|
||||||
|
scope.get(name)?.let { return@mapIndexed it }
|
||||||
|
}
|
||||||
|
if (slotId < target.slotCount) {
|
||||||
|
return@mapIndexed target.getSlotRecord(slotId)
|
||||||
|
}
|
||||||
|
if (name != null) {
|
||||||
|
target.applySlotPlan(mapOf(name to slotId))
|
||||||
|
return@mapIndexed target.getSlotRecord(slotId)
|
||||||
|
}
|
||||||
|
error("Missing module capture slot $slotId")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -3877,10 +3991,15 @@ class CmdFrame(
|
|||||||
.firstOrNull { fn.scopeSlotIsModule.getOrNull(it) == true }
|
.firstOrNull { fn.scopeSlotIsModule.getOrNull(it) == true }
|
||||||
?.let { fn.scopeSlotNames[it] }
|
?.let { fn.scopeSlotNames[it] }
|
||||||
if (moduleSlotName != null) {
|
if (moduleSlotName != null) {
|
||||||
|
findModuleScope(scope)?.let { return it }
|
||||||
val bySlot = findScopeWithSlot(scope, moduleSlotName)
|
val bySlot = findScopeWithSlot(scope, moduleSlotName)
|
||||||
bySlot?.let { return it }
|
if (bySlot is ModuleScope) return bySlot
|
||||||
|
val bySlotParent = bySlot?.parent
|
||||||
|
if (bySlotParent is ModuleScope) return bySlotParent
|
||||||
val byRecord = findScopeWithRecord(scope, moduleSlotName)
|
val byRecord = findScopeWithRecord(scope, moduleSlotName)
|
||||||
byRecord?.let { return it }
|
if (byRecord is ModuleScope) return byRecord
|
||||||
|
val byRecordParent = byRecord?.parent
|
||||||
|
if (byRecordParent is ModuleScope) return byRecordParent
|
||||||
return scope
|
return scope
|
||||||
}
|
}
|
||||||
findModuleScope(scope)?.let { return it }
|
findModuleScope(scope)?.let { return it }
|
||||||
@@ -3931,7 +4050,7 @@ class CmdFrame(
|
|||||||
val current = queue.removeFirst()
|
val current = queue.removeFirst()
|
||||||
if (!visited.add(current)) continue
|
if (!visited.add(current)) continue
|
||||||
if (current is ModuleScope) return current
|
if (current is ModuleScope) return current
|
||||||
if (current.parent is ModuleScope) return current
|
if (current.parent is ModuleScope) return current.parent
|
||||||
current.parent?.let { queue.add(it) }
|
current.parent?.let { queue.add(it) }
|
||||||
if (current is BytecodeClosureScope) {
|
if (current is BytecodeClosureScope) {
|
||||||
queue.add(current.closureScope)
|
queue.add(current.closureScope)
|
||||||
@@ -3951,11 +4070,15 @@ class CmdFrame(
|
|||||||
return scope
|
return scope
|
||||||
}
|
}
|
||||||
|
|
||||||
fun handleException(t: Throwable): Boolean {
|
suspend fun handleException(t: Throwable): Boolean {
|
||||||
val handler = tryStack.lastOrNull() ?: return false
|
val handler = tryStack.lastOrNull() ?: return false
|
||||||
|
vmIterDebug(
|
||||||
|
"handleException fn=${fn.name} throwable=${t::class.simpleName} message=${t.message} catchIp=${handler.catchIp} finallyIp=${handler.finallyIp} iterDepth=${iterStack.size}"
|
||||||
|
)
|
||||||
val finallyIp = handler.finallyIp
|
val finallyIp = handler.finallyIp
|
||||||
if (t is ReturnException || t is LoopBreakContinueException) {
|
if (t is ReturnException || t is LoopBreakContinueException) {
|
||||||
if (finallyIp >= 0) {
|
if (finallyIp >= 0) {
|
||||||
|
cancelIteratorsToDepth(handler.iterDepthAtPush, "handleException:returnOrLoop->finally")
|
||||||
pendingThrowable = t
|
pendingThrowable = t
|
||||||
ip = finallyIp
|
ip = finallyIp
|
||||||
return true
|
return true
|
||||||
@@ -3964,6 +4087,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
if (handler.inCatch) {
|
if (handler.inCatch) {
|
||||||
if (finallyIp >= 0) {
|
if (finallyIp >= 0) {
|
||||||
|
cancelIteratorsToDepth(handler.iterDepthAtPush, "handleException:inCatch->finally")
|
||||||
pendingThrowable = t
|
pendingThrowable = t
|
||||||
ip = finallyIp
|
ip = finallyIp
|
||||||
return true
|
return true
|
||||||
@@ -3973,6 +4097,7 @@ class CmdFrame(
|
|||||||
handler.inCatch = true
|
handler.inCatch = true
|
||||||
pendingThrowable = t
|
pendingThrowable = t
|
||||||
if (handler.catchIp >= 0) {
|
if (handler.catchIp >= 0) {
|
||||||
|
cancelIteratorsToDepth(handler.iterDepthAtPush, "handleException:toCatch")
|
||||||
val caughtObj = when (t) {
|
val caughtObj = when (t) {
|
||||||
is ExecutionError -> t.errorObject
|
is ExecutionError -> t.errorObject
|
||||||
else -> ObjUnknownException(ensureScope(), t.message ?: t.toString())
|
else -> ObjUnknownException(ensureScope(), t.message ?: t.toString())
|
||||||
@@ -3982,6 +4107,7 @@ class CmdFrame(
|
|||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
if (finallyIp >= 0) {
|
if (finallyIp >= 0) {
|
||||||
|
cancelIteratorsToDepth(handler.iterDepthAtPush, "handleException:toFinallyNoCatch")
|
||||||
ip = finallyIp
|
ip = finallyIp
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -3989,7 +4115,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun pushTry(exceptionSlot: Int, catchIp: Int, finallyIp: Int) {
|
fun pushTry(exceptionSlot: Int, catchIp: Int, finallyIp: Int) {
|
||||||
tryStack.addLast(TryHandler(exceptionSlot, catchIp, finallyIp))
|
tryStack.addLast(TryHandler(exceptionSlot, catchIp, finallyIp, iterDepthAtPush = iterStack.size))
|
||||||
}
|
}
|
||||||
|
|
||||||
fun popTry() {
|
fun popTry() {
|
||||||
@@ -4046,24 +4172,47 @@ class CmdFrame(
|
|||||||
|
|
||||||
fun pushIterator(iter: Obj) {
|
fun pushIterator(iter: Obj) {
|
||||||
iterStack.addLast(iter)
|
iterStack.addLast(iter)
|
||||||
|
if (iter.objClass.className == "FlowIterator") {
|
||||||
|
vmIterDebug("pushIterator fn=${fn.name} depth=${iterStack.size} iterClass=${iter.objClass.className}")
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun popIterator() {
|
fun popIterator() {
|
||||||
|
val iter = iterStack.lastOrNull()
|
||||||
|
if (iter != null && iter.objClass.className == "FlowIterator") {
|
||||||
|
vmIterDebug("popIterator fn=${fn.name} depth=${iterStack.size} iterClass=${iter.objClass.className}")
|
||||||
|
}
|
||||||
iterStack.removeLastOrNull()
|
iterStack.removeLastOrNull()
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun cancelTopIterator() {
|
suspend fun cancelTopIterator() {
|
||||||
val iter = iterStack.removeLastOrNull() ?: return
|
val iter = iterStack.removeLastOrNull() ?: return
|
||||||
|
vmIterDebug("cancelTopIterator fn=${fn.name} depthAfter=${iterStack.size} iterClass=${iter.objClass.className}")
|
||||||
iter.invokeInstanceMethod(ensureScope(), "cancelIteration") { ObjVoid }
|
iter.invokeInstanceMethod(ensureScope(), "cancelIteration") { ObjVoid }
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun cancelIterators() {
|
suspend fun cancelIterators() {
|
||||||
while (iterStack.isNotEmpty()) {
|
while (iterStack.isNotEmpty()) {
|
||||||
val iter = iterStack.removeLast()
|
val iter = iterStack.removeLast()
|
||||||
|
vmIterDebug("cancelIterators fn=${fn.name} depthAfter=${iterStack.size} iterClass=${iter.objClass.className}")
|
||||||
iter.invokeInstanceMethod(ensureScope(), "cancelIteration") { ObjVoid }
|
iter.invokeInstanceMethod(ensureScope(), "cancelIteration") { ObjVoid }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private suspend fun cancelIteratorsToDepth(depth: Int, reason: String) {
|
||||||
|
while (iterStack.size > depth) {
|
||||||
|
val iter = iterStack.removeLast()
|
||||||
|
vmIterDebug(
|
||||||
|
"cancelIteratorsToDepth fn=${fn.name} reason=$reason targetDepth=$depth depthAfter=${iterStack.size} iterClass=${iter.objClass.className}"
|
||||||
|
)
|
||||||
|
try {
|
||||||
|
iter.invokeInstanceMethod(ensureScope(), "cancelIteration") { ObjVoid }
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
vmIterDebug("cancelIteratorsToDepth: cancelIteration failed fn=${fn.name} reason=$reason", e)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun pushSlotPlan(plan: Map<String, Int>) {
|
fun pushSlotPlan(plan: Map<String, Int>) {
|
||||||
if (scope.hasSlotPlanConflict(plan)) {
|
if (scope.hasSlotPlanConflict(plan)) {
|
||||||
scopeStack.addLast(scope)
|
scopeStack.addLast(scope)
|
||||||
@@ -4114,6 +4263,7 @@ class CmdFrame(
|
|||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
ensureLocalMutable(localIndex)
|
ensureLocalMutable(localIndex)
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(value)
|
existing.write(value)
|
||||||
@@ -4125,6 +4275,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setObj(localIndex, value)
|
frame.setObj(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4170,6 +4321,7 @@ class CmdFrame(
|
|||||||
target.setSlotValue(index, ObjInt.of(value))
|
target.setSlotValue(index, ObjInt.of(value))
|
||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(ObjInt.of(value))
|
existing.write(ObjInt.of(value))
|
||||||
@@ -4181,6 +4333,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setInt(localIndex, value)
|
frame.setInt(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4198,6 +4351,7 @@ class CmdFrame(
|
|||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
ensureLocalMutable(localIndex)
|
ensureLocalMutable(localIndex)
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(ObjInt.of(value))
|
existing.write(ObjInt.of(value))
|
||||||
@@ -4209,6 +4363,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setInt(localIndex, value)
|
frame.setInt(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4256,6 +4411,7 @@ class CmdFrame(
|
|||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
ensureLocalMutable(localIndex)
|
ensureLocalMutable(localIndex)
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(ObjReal.of(value))
|
existing.write(ObjReal.of(value))
|
||||||
@@ -4267,6 +4423,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setReal(localIndex, value)
|
frame.setReal(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4278,6 +4435,7 @@ class CmdFrame(
|
|||||||
target.setSlotValue(index, ObjReal.of(value))
|
target.setSlotValue(index, ObjReal.of(value))
|
||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(ObjReal.of(value))
|
existing.write(ObjReal.of(value))
|
||||||
@@ -4289,6 +4447,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setReal(localIndex, value)
|
frame.setReal(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4330,6 +4489,7 @@ class CmdFrame(
|
|||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
ensureLocalMutable(localIndex)
|
ensureLocalMutable(localIndex)
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(if (value) ObjTrue else ObjFalse)
|
existing.write(if (value) ObjTrue else ObjFalse)
|
||||||
@@ -4341,6 +4501,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setBool(localIndex, value)
|
frame.setBool(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4352,6 +4513,7 @@ class CmdFrame(
|
|||||||
target.setSlotValue(index, if (value) ObjTrue else ObjFalse)
|
target.setSlotValue(index, if (value) ObjTrue else ObjFalse)
|
||||||
} else {
|
} else {
|
||||||
val localIndex = slot - fn.scopeSlotCount
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
when (val existing = frame.getRawObj(localIndex)) {
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
is FrameSlotRef -> {
|
is FrameSlotRef -> {
|
||||||
existing.write(if (value) ObjTrue else ObjFalse)
|
existing.write(if (value) ObjTrue else ObjFalse)
|
||||||
@@ -4363,6 +4525,7 @@ class CmdFrame(
|
|||||||
}
|
}
|
||||||
else -> {}
|
else -> {}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
frame.setBool(localIndex, value)
|
frame.setBool(localIndex, value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -4450,7 +4613,30 @@ class CmdFrame(
|
|||||||
val index = ensureScopeSlot(target, slot)
|
val index = ensureScopeSlot(target, slot)
|
||||||
target.setSlotValue(index, value)
|
target.setSlotValue(index, value)
|
||||||
} else {
|
} else {
|
||||||
frame.setObj(slot - fn.scopeSlotCount, value)
|
val localIndex = slot - fn.scopeSlotCount
|
||||||
|
if (shouldWriteThroughLocal(localIndex)) {
|
||||||
|
when (val existing = frame.getRawObj(localIndex)) {
|
||||||
|
is FrameSlotRef -> {
|
||||||
|
existing.write(value)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
is RecordSlotRef -> {
|
||||||
|
existing.write(value)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
else -> {}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
frame.setObj(localIndex, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun shouldWriteThroughLocal(localIndex: Int): Boolean {
|
||||||
|
if (localIndex < fn.localSlotCaptures.size && fn.localSlotCaptures[localIndex]) return true
|
||||||
|
if (localIndex < fn.localSlotDelegated.size && fn.localSlotDelegated[localIndex]) return true
|
||||||
|
return when (frame.getRawObj(localIndex)) {
|
||||||
|
is FrameSlotRef, is RecordSlotRef -> true
|
||||||
|
else -> false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -4544,7 +4730,12 @@ class CmdFrame(
|
|||||||
positional.add(value)
|
positional.add(value)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return Arguments(positional, plan.tailBlock, named ?: emptyMap())
|
return Arguments(
|
||||||
|
list = positional,
|
||||||
|
tailBlockMode = plan.tailBlock,
|
||||||
|
named = named ?: emptyMap(),
|
||||||
|
explicitTypeArgs = plan.explicitTypeArgs
|
||||||
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resolveLocalScope(localIndex: Int): Scope? {
|
private fun resolveLocalScope(localIndex: Int): Scope? {
|
||||||
@@ -4591,6 +4782,19 @@ class CmdFrame(
|
|||||||
if (direct is FrameSlotRef) return direct.read()
|
if (direct is FrameSlotRef) return direct.read()
|
||||||
if (direct is RecordSlotRef) return direct.read()
|
if (direct is RecordSlotRef) return direct.read()
|
||||||
val name = fn.scopeSlotNames[slot]
|
val name = fn.scopeSlotNames[slot]
|
||||||
|
if (name != null && record.memberName != null && record.memberName != name) {
|
||||||
|
val resolved = target.get(name)
|
||||||
|
if (resolved != null) {
|
||||||
|
val resolvedValue = resolved.value
|
||||||
|
if (resolved.type == ObjRecord.Type.Delegated || resolved.type == ObjRecord.Type.Property || resolvedValue is ObjProperty) {
|
||||||
|
return target.resolve(resolved, name)
|
||||||
|
}
|
||||||
|
if (resolvedValue !== ObjUnset) {
|
||||||
|
target.updateSlotFor(name, resolved)
|
||||||
|
}
|
||||||
|
return resolvedValue
|
||||||
|
}
|
||||||
|
}
|
||||||
if (name != null && (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property || direct is ObjProperty)) {
|
if (name != null && (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property || direct is ObjProperty)) {
|
||||||
return target.resolve(record, name)
|
return target.resolve(record, name)
|
||||||
}
|
}
|
||||||
@@ -4614,6 +4818,19 @@ class CmdFrame(
|
|||||||
if (direct is RecordSlotRef) return direct.read()
|
if (direct is RecordSlotRef) return direct.read()
|
||||||
val slotId = addrScopeSlots[addrSlot]
|
val slotId = addrScopeSlots[addrSlot]
|
||||||
val name = fn.scopeSlotNames.getOrNull(slotId)
|
val name = fn.scopeSlotNames.getOrNull(slotId)
|
||||||
|
if (name != null && record.memberName != null && record.memberName != name) {
|
||||||
|
val resolved = target.get(name)
|
||||||
|
if (resolved != null) {
|
||||||
|
val resolvedValue = resolved.value
|
||||||
|
if (resolved.type == ObjRecord.Type.Delegated || resolved.type == ObjRecord.Type.Property || resolvedValue is ObjProperty) {
|
||||||
|
return target.resolve(resolved, name)
|
||||||
|
}
|
||||||
|
if (resolvedValue !== ObjUnset) {
|
||||||
|
target.updateSlotFor(name, resolved)
|
||||||
|
}
|
||||||
|
return resolvedValue
|
||||||
|
}
|
||||||
|
}
|
||||||
if (name != null && (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property || direct is ObjProperty)) {
|
if (name != null && (record.type == ObjRecord.Type.Delegated || record.type == ObjRecord.Type.Property || direct is ObjProperty)) {
|
||||||
return target.resolve(record, name)
|
return target.resolve(record, name)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.bytecode
|
||||||
|
|
||||||
|
internal expect fun vmIterDebug(message: String, error: Throwable? = null)
|
||||||
@@ -46,7 +46,7 @@ private val fallbackKeywordIds = setOf(
|
|||||||
"private", "protected", "static", "open", "extern", "init", "get", "set", "by", "step",
|
"private", "protected", "static", "open", "extern", "init", "get", "set", "by", "step",
|
||||||
// control flow and misc
|
// control flow and misc
|
||||||
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
||||||
"throw", "return", "break", "continue", "this", "null", "true", "false", "unset"
|
"throw", "return", "break", "continue", "this", "null", "true", "false", "unset", "void"
|
||||||
)
|
)
|
||||||
|
|
||||||
/** Maps lexer token type (and sometimes value) to a [HighlightKind]. */
|
/** Maps lexer token type (and sometimes value) to a [HighlightKind]. */
|
||||||
|
|||||||
@@ -178,6 +178,7 @@ object CompletionEngineLight {
|
|||||||
is MiniMemberDecl -> node.range
|
is MiniMemberDecl -> node.range
|
||||||
else -> return
|
else -> return
|
||||||
}
|
}
|
||||||
|
if (range.start.source != src || range.end.source != src) return
|
||||||
val start = src.offsetOf(range.start)
|
val start = src.offsetOf(range.start)
|
||||||
val end = src.offsetOf(range.end).coerceAtMost(text.length)
|
val end = src.offsetOf(range.end).coerceAtMost(text.length)
|
||||||
|
|
||||||
@@ -372,9 +373,12 @@ object CompletionEngineLight {
|
|||||||
val src = Source("<engine>", text)
|
val src = Source("<engine>", text)
|
||||||
val provider = LenientImportProvider.create()
|
val provider = LenientImportProvider.create()
|
||||||
Compiler.compileWithMini(src, provider, sink)
|
Compiler.compileWithMini(src, provider, sink)
|
||||||
sink.build()
|
sink.build() ?: MiniScript(MiniRange(src.startPos, src.startPos))
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
sink.build()
|
sink.build() ?: run {
|
||||||
|
val src = Source("<engine>", text)
|
||||||
|
MiniScript(MiniRange(src.startPos, src.startPos))
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -387,6 +391,7 @@ object CompletionEngineLight {
|
|||||||
|
|
||||||
// Text helpers
|
// Text helpers
|
||||||
private fun prefixAt(text: String, offset: Int): String {
|
private fun prefixAt(text: String, offset: Int): String {
|
||||||
|
if (text.isEmpty()) return ""
|
||||||
val off = offset.coerceIn(0, text.length)
|
val off = offset.coerceIn(0, text.length)
|
||||||
var i = (off - 1).coerceAtLeast(0)
|
var i = (off - 1).coerceAtLeast(0)
|
||||||
while (i >= 0 && DocLookupUtils.isIdentChar(text[i])) i--
|
while (i >= 0 && DocLookupUtils.isIdentChar(text[i])) i--
|
||||||
|
|||||||
@@ -1163,6 +1163,7 @@ object DocLookupUtils {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun findDotLeft(text: String, offset: Int): Int? {
|
fun findDotLeft(text: String, offset: Int): Int? {
|
||||||
|
if (text.isEmpty()) return null
|
||||||
var i = (offset - 1).coerceAtLeast(0)
|
var i = (offset - 1).coerceAtLeast(0)
|
||||||
while (i >= 0 && text[i].isWhitespace()) i--
|
while (i >= 0 && text[i].isWhitespace()) i--
|
||||||
return if (i >= 0 && text[i] == '.') i else null
|
return if (i >= 0 && text[i] == '.') i else null
|
||||||
|
|||||||
@@ -37,8 +37,20 @@ object StdlibDocsBootstrap {
|
|||||||
@Suppress("UNUSED_VARIABLE")
|
@Suppress("UNUSED_VARIABLE")
|
||||||
val _list = net.sergeych.lyng.obj.ObjList.type
|
val _list = net.sergeych.lyng.obj.ObjList.type
|
||||||
@Suppress("UNUSED_VARIABLE")
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _immutableList = net.sergeych.lyng.obj.ObjImmutableList.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
val _map = net.sergeych.lyng.obj.ObjMap.type
|
val _map = net.sergeych.lyng.obj.ObjMap.type
|
||||||
@Suppress("UNUSED_VARIABLE")
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _immutableMap = net.sergeych.lyng.obj.ObjImmutableMap.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _set = net.sergeych.lyng.obj.ObjSet.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _immutableSet = net.sergeych.lyng.obj.ObjImmutableSet.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _observableList = net.sergeych.lyng.obj.ObjObservableList.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
|
val _subscription = net.sergeych.lyng.obj.ObjSubscription.type
|
||||||
|
@Suppress("UNUSED_VARIABLE")
|
||||||
val _int = net.sergeych.lyng.obj.ObjInt.type
|
val _int = net.sergeych.lyng.obj.ObjInt.type
|
||||||
@Suppress("UNUSED_VARIABLE")
|
@Suppress("UNUSED_VARIABLE")
|
||||||
val _real = net.sergeych.lyng.obj.ObjReal.type
|
val _real = net.sergeych.lyng.obj.ObjReal.type
|
||||||
|
|||||||
@@ -646,6 +646,9 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun getAt(scope: Scope, index: Obj): Obj {
|
open suspend fun getAt(scope: Scope, index: Obj): Obj {
|
||||||
|
if (hasNonRootIndexerMember("getAt")) {
|
||||||
|
return invokeInstanceMethod(scope, "getAt", Arguments(index))
|
||||||
|
}
|
||||||
if (index is ObjString) {
|
if (index is ObjString) {
|
||||||
return readField(scope, index.value).value
|
return readField(scope, index.value).value
|
||||||
}
|
}
|
||||||
@@ -655,6 +658,16 @@ open class Obj {
|
|||||||
suspend fun getAt(scope: Scope, index: Int): Obj = getAt(scope, ObjInt(index.toLong()))
|
suspend fun getAt(scope: Scope, index: Int): Obj = getAt(scope, ObjInt(index.toLong()))
|
||||||
|
|
||||||
open suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
open suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
||||||
|
when {
|
||||||
|
hasNonRootIndexerMember("putAt") -> {
|
||||||
|
invokeInstanceMethod(scope, "putAt", Arguments(index, newValue))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
hasNonRootIndexerMember("setAt") -> {
|
||||||
|
invokeInstanceMethod(scope, "setAt", Arguments(index, newValue))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
if (index is ObjString) {
|
if (index is ObjString) {
|
||||||
writeField(scope, index.value, newValue)
|
writeField(scope, index.value, newValue)
|
||||||
return
|
return
|
||||||
@@ -662,6 +675,17 @@ open class Obj {
|
|||||||
scope.raiseNotImplemented("indexing")
|
scope.raiseNotImplemented("indexing")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun hasNonRootIndexerMember(name: String): Boolean {
|
||||||
|
for (cls in objClass.mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
|
if (rec != null && !rec.isAbstract && rec.type != ObjRecord.Type.Delegated) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
open suspend fun callOn(scope: Scope): Obj {
|
open suspend fun callOn(scope: Scope): Obj {
|
||||||
scope.raiseNotImplemented()
|
scope.raiseNotImplemented()
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -826,6 +826,7 @@ open class ObjClass(
|
|||||||
type: ObjRecord.Type = ObjRecord.Type.Field,
|
type: ObjRecord.Type = ObjRecord.Type.Field,
|
||||||
fieldId: Int? = null,
|
fieldId: Int? = null,
|
||||||
methodId: Int? = null,
|
methodId: Int? = null,
|
||||||
|
typeDecl: net.sergeych.lyng.TypeDecl? = null,
|
||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
// Validation of override rules: only for non-system declarations
|
// Validation of override rules: only for non-system declarations
|
||||||
var existing: ObjRecord? = null
|
var existing: ObjRecord? = null
|
||||||
@@ -921,6 +922,7 @@ open class ObjClass(
|
|||||||
isOverride = isOverride,
|
isOverride = isOverride,
|
||||||
isTransient = isTransient,
|
isTransient = isTransient,
|
||||||
type = type,
|
type = type,
|
||||||
|
typeDecl = typeDecl,
|
||||||
memberName = name,
|
memberName = name,
|
||||||
fieldId = effectiveFieldId,
|
fieldId = effectiveFieldId,
|
||||||
methodId = effectiveMethodId
|
methodId = effectiveMethodId
|
||||||
@@ -1196,7 +1198,22 @@ open class ObjClass(
|
|||||||
return JsonObject(result)
|
return JsonObject(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj =
|
open suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
scope.raiseNotImplemented()
|
val meta = constructorMeta
|
||||||
|
?: scope.raiseError("can't deserialize non-serializable object (no constructor meta)")
|
||||||
|
val params = meta.params.filter { !it.isTransient }
|
||||||
|
val values = decoder.decodeAnyList(scope)
|
||||||
|
if (values.size > params.size) {
|
||||||
|
scope.raiseIllegalArgument(
|
||||||
|
"serialized params has bigger size ${values.size} than constructor params (${params.size}): " +
|
||||||
|
values.joinToString(",")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
val instance = callWithArgs(scope, *values.toTypedArray())
|
||||||
|
if (instance is ObjInstance) {
|
||||||
|
instance.deserializeStateVars(scope, decoder)
|
||||||
|
}
|
||||||
|
return instance
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,6 +19,7 @@ package net.sergeych.lyng.obj
|
|||||||
|
|
||||||
import net.sergeych.lyng.Arguments
|
import net.sergeych.lyng.Arguments
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.bytecode.BytecodeLambdaCallable
|
||||||
|
|
||||||
class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
||||||
override val objClass: ObjClass get() = type
|
override val objClass: ObjClass get() = type
|
||||||
@@ -29,7 +30,8 @@ class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
|||||||
val d = thisAs<ObjDynamicContext>().delegate
|
val d = thisAs<ObjDynamicContext>().delegate
|
||||||
if (d.readCallback != null)
|
if (d.readCallback != null)
|
||||||
raiseIllegalState("get already defined")
|
raiseIllegalState("get already defined")
|
||||||
d.readCallback = requireOnlyArg()
|
val callback = requireOnlyArg<Obj>()
|
||||||
|
d.readCallback = d.rebindCallback(requireScope(), callback)
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -37,7 +39,8 @@ class ObjDynamicContext(val delegate: ObjDynamic) : Obj() {
|
|||||||
val d = thisAs<ObjDynamicContext>().delegate
|
val d = thisAs<ObjDynamicContext>().delegate
|
||||||
if (d.writeCallback != null)
|
if (d.writeCallback != null)
|
||||||
raiseIllegalState("set already defined")
|
raiseIllegalState("set already defined")
|
||||||
d.writeCallback = requireOnlyArg()
|
val callback = requireOnlyArg<Obj>()
|
||||||
|
d.writeCallback = d.rebindCallback(requireScope(), callback)
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -55,6 +58,11 @@ open class ObjDynamic(var readCallback: Obj? = null, var writeCallback: Obj? = n
|
|||||||
override val objClass: ObjClass get() = type
|
override val objClass: ObjClass get() = type
|
||||||
// Capture the lexical scope used to build this dynamic so callbacks can see outer locals
|
// Capture the lexical scope used to build this dynamic so callbacks can see outer locals
|
||||||
internal var builderScope: Scope? = null
|
internal var builderScope: Scope? = null
|
||||||
|
internal fun rebindCallback(contextScope: Scope, callback: Obj): Obj {
|
||||||
|
val snapshot = builderScope ?: return callback
|
||||||
|
val context = Scope(snapshot, contextScope.args, contextScope.pos, contextScope.thisObj)
|
||||||
|
return (callback as? BytecodeLambdaCallable)?.rebindClosure(context) ?: callback
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Use read callback to dynamically resolve the field name. Note that it does not work
|
* Use read callback to dynamically resolve the field name. Note that it does not work
|
||||||
@@ -113,8 +121,9 @@ open class ObjDynamic(var readCallback: Obj? = null, var writeCallback: Obj? = n
|
|||||||
// Capture the function's lexical scope (scope) so callbacks can see outer locals like parameters.
|
// Capture the function's lexical scope (scope) so callbacks can see outer locals like parameters.
|
||||||
// Build the dynamic in a child scope purely to set `this` to context, but keep captured closure at parent.
|
// Build the dynamic in a child scope purely to set `this` to context, but keep captured closure at parent.
|
||||||
val buildScope = scope.createChildScope(newThisObj = context)
|
val buildScope = scope.createChildScope(newThisObj = context)
|
||||||
// Snapshot the caller scope to capture locals/args even if the runtime pools/reuses frames
|
// Snapshot the caller scope to capture locals/args even if the runtime pools/reuses frames.
|
||||||
delegate.builderScope = scope.snapshotForClosure()
|
// Module scope should stay late-bound to allow extern class rebinding and similar updates.
|
||||||
|
delegate.builderScope = if (scope is net.sergeych.lyng.ModuleScope) null else scope.snapshotForClosure()
|
||||||
builder.callOn(buildScope)
|
builder.callOn(buildScope)
|
||||||
return delegate
|
return delegate
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -24,7 +24,8 @@ import kotlinx.coroutines.channels.ReceiveChannel
|
|||||||
import kotlinx.coroutines.channels.SendChannel
|
import kotlinx.coroutines.channels.SendChannel
|
||||||
import kotlinx.coroutines.sync.Mutex
|
import kotlinx.coroutines.sync.Mutex
|
||||||
import kotlinx.coroutines.sync.withLock
|
import kotlinx.coroutines.sync.withLock
|
||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.ScriptFlowIsNoMoreCollected
|
||||||
import net.sergeych.lyng.miniast.ParamDoc
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
import net.sergeych.lyng.miniast.TypeGenericDoc
|
import net.sergeych.lyng.miniast.TypeGenericDoc
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
@@ -55,7 +56,7 @@ class ObjFlowBuilder(val output: SendChannel<Obj>) : Obj() {
|
|||||||
else
|
else
|
||||||
// Flow consumer is no longer collecting; signal producer to stop
|
// Flow consumer is no longer collecting; signal producer to stop
|
||||||
throw ScriptFlowIsNoMoreCollected()
|
throw ScriptFlowIsNoMoreCollected()
|
||||||
} catch (x: Exception) {
|
} catch (x: Throwable) {
|
||||||
// Any failure to send (including closed channel) should gracefully stop the producer.
|
// Any failure to send (including closed channel) should gracefully stop the producer.
|
||||||
if (x is CancellationException) {
|
if (x is CancellationException) {
|
||||||
// Cancellation is a normal control-flow event
|
// Cancellation is a normal control-flow event
|
||||||
@@ -80,7 +81,7 @@ private fun createLyngFlowInput(scope: Scope, producer: Obj): ReceiveChannel<Obj
|
|||||||
producer.callOn(builderScope)
|
producer.callOn(builderScope)
|
||||||
} catch (x: ScriptFlowIsNoMoreCollected) {
|
} catch (x: ScriptFlowIsNoMoreCollected) {
|
||||||
// premature flow closing, OK
|
// premature flow closing, OK
|
||||||
} catch (x: Exception) {
|
} catch (x: Throwable) {
|
||||||
channel.close(x)
|
channel.close(x)
|
||||||
return@globalLaunch
|
return@globalLaunch
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,197 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
import net.sergeych.lynon.LynonDecoder
|
||||||
|
import net.sergeych.lynon.LynonEncoder
|
||||||
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
|
class ObjImmutableList(items: List<Obj> = emptyList()) : Obj() {
|
||||||
|
private val data: List<Obj> = items.toList()
|
||||||
|
|
||||||
|
override val objClass: ObjClass
|
||||||
|
get() = type
|
||||||
|
|
||||||
|
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
return when (other) {
|
||||||
|
is ObjImmutableList -> data.size == other.data.size && data.indices.all { i -> data[i].equals(scope, other.data[i]) }
|
||||||
|
else -> {
|
||||||
|
if (other.isInstanceOf(ObjIterable)) compareTo(scope, other) == 0 else false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
if (other is ObjImmutableList) {
|
||||||
|
val mySize = data.size
|
||||||
|
val otherSize = other.data.size
|
||||||
|
val commonSize = minOf(mySize, otherSize)
|
||||||
|
for (i in 0..<commonSize) {
|
||||||
|
val d = data[i].compareTo(scope, other.data[i])
|
||||||
|
if (d != 0) return d
|
||||||
|
}
|
||||||
|
return mySize.compareTo(otherSize)
|
||||||
|
}
|
||||||
|
if (other.isInstanceOf(ObjIterable)) {
|
||||||
|
val it1 = data.iterator()
|
||||||
|
val it2 = other.invokeInstanceMethod(scope, "iterator")
|
||||||
|
val hasNext2 = it2.getInstanceMethod(scope, "hasNext")
|
||||||
|
val next2 = it2.getInstanceMethod(scope, "next")
|
||||||
|
while (it1.hasNext()) {
|
||||||
|
if (!hasNext2.invoke(scope, it2).toBool()) return 1
|
||||||
|
val d = it1.next().compareTo(scope, next2.invoke(scope, it2))
|
||||||
|
if (d != 0) return d
|
||||||
|
}
|
||||||
|
return if (hasNext2.invoke(scope, it2).toBool()) -1 else 0
|
||||||
|
}
|
||||||
|
return -2
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getAt(scope: Scope, index: Obj): Obj {
|
||||||
|
return when (index) {
|
||||||
|
is ObjInt -> data[index.toInt()]
|
||||||
|
is ObjRange -> {
|
||||||
|
when {
|
||||||
|
index.start is ObjInt && index.end is ObjInt -> {
|
||||||
|
if (index.isEndInclusive)
|
||||||
|
ObjImmutableList(data.subList(index.start.toInt(), index.end.toInt() + 1))
|
||||||
|
else
|
||||||
|
ObjImmutableList(data.subList(index.start.toInt(), index.end.toInt()))
|
||||||
|
}
|
||||||
|
index.isOpenStart && !index.isOpenEnd -> {
|
||||||
|
if (index.isEndInclusive)
|
||||||
|
ObjImmutableList(data.subList(0, index.end!!.toInt() + 1))
|
||||||
|
else
|
||||||
|
ObjImmutableList(data.subList(0, index.end!!.toInt()))
|
||||||
|
}
|
||||||
|
index.isOpenEnd && !index.isOpenStart -> ObjImmutableList(data.subList(index.start!!.toInt(), data.size))
|
||||||
|
index.isOpenStart && index.isOpenEnd -> ObjImmutableList(data)
|
||||||
|
else -> throw RuntimeException("Can't apply range for index: $index")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else -> scope.raiseIllegalArgument("Illegal index object for immutable list: ${index.inspect(scope)}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun contains(scope: Scope, other: Obj): Boolean {
|
||||||
|
if (net.sergeych.lyng.PerfFlags.PRIMITIVE_FASTOPS && other is ObjInt) {
|
||||||
|
var i = 0
|
||||||
|
val sz = data.size
|
||||||
|
while (i < sz) {
|
||||||
|
val v = data[i]
|
||||||
|
if (v is ObjInt && v.value == other.value) return true
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
return data.contains(other)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun enumerate(scope: Scope, callback: suspend (Obj) -> Boolean) {
|
||||||
|
for (item in data) {
|
||||||
|
if (!callback(item)) break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun plus(scope: Scope, other: Obj): Obj {
|
||||||
|
return when {
|
||||||
|
other is ObjImmutableList -> ObjImmutableList(data + other.data)
|
||||||
|
other is ObjList -> ObjImmutableList(data + other.list)
|
||||||
|
other.isInstanceOf(ObjIterable) && other !is ObjString && other !is ObjBuffer -> {
|
||||||
|
val l = other.callMethod<ObjList>(scope, "toList")
|
||||||
|
ObjImmutableList(data + l.list)
|
||||||
|
}
|
||||||
|
else -> ObjImmutableList(data + other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun minus(scope: Scope, other: Obj): Obj {
|
||||||
|
if (other !is ObjString && other !is ObjBuffer && other.isInstanceOf(ObjIterable)) {
|
||||||
|
val toRemove = mutableSetOf<Obj>()
|
||||||
|
other.enumerate(scope) {
|
||||||
|
toRemove += it
|
||||||
|
true
|
||||||
|
}
|
||||||
|
return ObjImmutableList(data.filterNot { toRemove.contains(it) })
|
||||||
|
}
|
||||||
|
val out = data.toMutableList()
|
||||||
|
out.remove(other)
|
||||||
|
return ObjImmutableList(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
encoder.encodeAnyList(scope, data)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun lynonType(): LynonType = LynonType.List
|
||||||
|
|
||||||
|
override suspend fun defaultToString(scope: Scope): ObjString {
|
||||||
|
return ObjString(buildString {
|
||||||
|
append("ImmutableList(")
|
||||||
|
var first = true
|
||||||
|
for (v in data) {
|
||||||
|
if (first) first = false else append(",")
|
||||||
|
append(v.toString(scope).value)
|
||||||
|
}
|
||||||
|
append(")")
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
|
fun toMutableList(): MutableList<Obj> = data.toMutableList()
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = object : ObjClass("ImmutableList", ObjArray) {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
return ObjImmutableList(scope.args.list)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
return ObjImmutableList(decoder.decodeAnyList(scope))
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "size",
|
||||||
|
doc = "Number of elements in this immutable list.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { (this.thisObj as ObjImmutableList).data.size.toObj() }
|
||||||
|
)
|
||||||
|
addFnDoc(
|
||||||
|
name = "toMutable",
|
||||||
|
doc = "Create a mutable copy of this immutable list.",
|
||||||
|
returns = type("lyng.List"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjList(thisAs<ObjImmutableList>().toMutableList())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toImmutable",
|
||||||
|
doc = "Return this immutable list.",
|
||||||
|
returns = type("lyng.ImmutableList"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
thisObj
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,196 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import kotlinx.serialization.json.JsonElement
|
||||||
|
import kotlinx.serialization.json.JsonObject
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.TypeGenericDoc
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
import net.sergeych.lynon.LynonDecoder
|
||||||
|
import net.sergeych.lynon.LynonEncoder
|
||||||
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
|
class ObjImmutableMap(entries: Map<Obj, Obj> = emptyMap()) : Obj() {
|
||||||
|
val map: Map<Obj, Obj> = LinkedHashMap(entries)
|
||||||
|
|
||||||
|
override val objClass get() = type
|
||||||
|
|
||||||
|
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
val otherMap = when (other) {
|
||||||
|
is ObjImmutableMap -> other.map
|
||||||
|
is ObjMap -> other.map
|
||||||
|
else -> return false
|
||||||
|
}
|
||||||
|
if (map.size != otherMap.size) return false
|
||||||
|
for ((k, v) in map) {
|
||||||
|
val ov = other.getAt(scope, k)
|
||||||
|
if (ov === ObjNull && !other.contains(scope, k)) return false
|
||||||
|
if (!v.equals(scope, ov)) return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
val otherMap = when (other) {
|
||||||
|
is ObjImmutableMap -> other.map
|
||||||
|
is ObjMap -> other.map
|
||||||
|
else -> return -1
|
||||||
|
}
|
||||||
|
if (map == otherMap) return 0
|
||||||
|
if (map.size != otherMap.size) return map.size.compareTo(otherMap.size)
|
||||||
|
return map.toString().compareTo(otherMap.toString())
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun getAt(scope: Scope, index: Obj): Obj = map[index] ?: ObjNull
|
||||||
|
|
||||||
|
override suspend fun contains(scope: Scope, other: Obj): Boolean = other in map
|
||||||
|
|
||||||
|
override suspend fun defaultToString(scope: Scope): ObjString {
|
||||||
|
val rendered = buildString {
|
||||||
|
append("ImmutableMap(")
|
||||||
|
var first = true
|
||||||
|
for ((k, v) in map) {
|
||||||
|
if (!first) append(",")
|
||||||
|
append(k.inspect(scope))
|
||||||
|
append(" => ")
|
||||||
|
append(v.toString(scope).value)
|
||||||
|
first = false
|
||||||
|
}
|
||||||
|
append(")")
|
||||||
|
}
|
||||||
|
return ObjString(rendered)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun lynonType(): LynonType = LynonType.Map
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
val keys = map.keys.map { it.toObj() }
|
||||||
|
val values = map.values.map { it.toObj() }
|
||||||
|
encoder.encodeAnyList(scope, keys)
|
||||||
|
encoder.encodeAnyList(scope, values, fixedSize = true)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toJson(scope: Scope): JsonElement {
|
||||||
|
return JsonObject(map.map { it.key.toString(scope).value to it.value.toJson(scope) }.toMap())
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun plus(scope: Scope, other: Obj): Obj {
|
||||||
|
val out = LinkedHashMap(map)
|
||||||
|
mergeIn(scope, out, other)
|
||||||
|
return ObjImmutableMap(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun mergeIn(scope: Scope, out: MutableMap<Obj, Obj>, other: Obj) {
|
||||||
|
when (other) {
|
||||||
|
is ObjImmutableMap -> out.putAll(other.map)
|
||||||
|
is ObjMap -> out.putAll(other.map)
|
||||||
|
is ObjMapEntry -> out[other.key] = other.value
|
||||||
|
is ObjList -> {
|
||||||
|
for (e in other.list) {
|
||||||
|
when (e) {
|
||||||
|
is ObjMapEntry -> out[e.key] = e.value
|
||||||
|
else -> {
|
||||||
|
if (e.isInstanceOf(ObjArray)) {
|
||||||
|
if (e.invokeInstanceMethod(scope, "size").toInt() != 2)
|
||||||
|
scope.raiseIllegalArgument("Array element to merge into map must have 2 elements, got $e")
|
||||||
|
out[e.getAt(scope, 0)] = e.getAt(scope, 1)
|
||||||
|
} else {
|
||||||
|
scope.raiseIllegalArgument("map can only be merged with MapEntry elements; got $e")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else -> scope.raiseIllegalArgument("map can only be merged with Map, ImmutableMap, MapEntry, or List<MapEntry>")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun toMutableMapCopy(): MutableMap<Obj, Obj> = LinkedHashMap(map)
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = object : ObjClass("ImmutableMap", ObjCollection) {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
return ObjImmutableMap(ObjMap.listToMap(scope, scope.args.list))
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
val keys = decoder.decodeAnyList(scope)
|
||||||
|
val values = decoder.decodeAnyList(scope, fixedSize = keys.size)
|
||||||
|
if (keys.size != values.size) scope.raiseIllegalArgument("map keys and values should be same size")
|
||||||
|
return ObjImmutableMap(keys.zip(values).toMap())
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
|
addFnDoc(
|
||||||
|
name = "getOrNull",
|
||||||
|
doc = "Get value by key or return null if the key is absent.",
|
||||||
|
params = listOf(ParamDoc("key")),
|
||||||
|
returns = type("lyng.Any", nullable = true),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
thisAs<ObjImmutableMap>().map[args.firstAndOnly(pos)] ?: ObjNull
|
||||||
|
}
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "size",
|
||||||
|
doc = "Number of entries in the immutable map.",
|
||||||
|
type = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { thisAs<ObjImmutableMap>().map.size.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "keys",
|
||||||
|
doc = "List of keys in this immutable map.",
|
||||||
|
type = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.Any"))),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { thisAs<ObjImmutableMap>().map.keys.toObj() }
|
||||||
|
)
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "values",
|
||||||
|
doc = "List of values in this immutable map.",
|
||||||
|
type = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.Any"))),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = { ObjList(thisAs<ObjImmutableMap>().map.values.toMutableList()) }
|
||||||
|
)
|
||||||
|
addFnDoc(
|
||||||
|
name = "iterator",
|
||||||
|
doc = "Iterator over map entries as MapEntry objects.",
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjKotlinIterator(thisAs<ObjImmutableMap>().map.entries.iterator())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toMutable",
|
||||||
|
doc = "Create a mutable copy of this immutable map.",
|
||||||
|
returns = type("lyng.Map"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjMap(thisAs<ObjImmutableMap>().toMutableMapCopy())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toImmutable",
|
||||||
|
doc = "Return this immutable map.",
|
||||||
|
returns = type("lyng.ImmutableMap"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) { thisObj }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,172 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
import net.sergeych.lynon.LynonDecoder
|
||||||
|
import net.sergeych.lynon.LynonEncoder
|
||||||
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
|
class ObjImmutableSet(items: Collection<Obj> = emptyList()) : Obj() {
|
||||||
|
private val data: Set<Obj> = LinkedHashSet(items)
|
||||||
|
|
||||||
|
override val objClass get() = type
|
||||||
|
|
||||||
|
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
val otherSet = when (other) {
|
||||||
|
is ObjImmutableSet -> other.data
|
||||||
|
is ObjSet -> other.set
|
||||||
|
else -> return false
|
||||||
|
}
|
||||||
|
if (data.size != otherSet.size) return false
|
||||||
|
for (e in data) {
|
||||||
|
if (!other.contains(scope, e)) return false
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
val otherSet = when (other) {
|
||||||
|
is ObjImmutableSet -> other.data
|
||||||
|
is ObjSet -> other.set
|
||||||
|
else -> return -2
|
||||||
|
}
|
||||||
|
if (data == otherSet) return 0
|
||||||
|
if (data.size != otherSet.size) return data.size.compareTo(otherSet.size)
|
||||||
|
return data.toString().compareTo(otherSet.toString())
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun contains(scope: Scope, other: Obj): Boolean = data.contains(other)
|
||||||
|
|
||||||
|
override suspend fun enumerate(scope: Scope, callback: suspend (Obj) -> Boolean) {
|
||||||
|
for (item in data) {
|
||||||
|
if (!callback(item)) break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun plus(scope: Scope, other: Obj): Obj {
|
||||||
|
val merged = LinkedHashSet(data)
|
||||||
|
when {
|
||||||
|
other is ObjImmutableSet -> merged.addAll(other.data)
|
||||||
|
other is ObjSet -> merged.addAll(other.set)
|
||||||
|
other is ObjString || other is ObjBuffer || !other.isInstanceOf(ObjIterable) -> merged.add(other)
|
||||||
|
else -> other.enumerate(scope) { merged += it; true }
|
||||||
|
}
|
||||||
|
return ObjImmutableSet(merged)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun minus(scope: Scope, other: Obj): Obj {
|
||||||
|
val out = LinkedHashSet(data)
|
||||||
|
when {
|
||||||
|
other is ObjImmutableSet -> out.removeAll(other.data)
|
||||||
|
other is ObjSet -> out.removeAll(other.set)
|
||||||
|
other is ObjString || other is ObjBuffer || !other.isInstanceOf(ObjIterable) -> out.remove(other)
|
||||||
|
else -> other.enumerate(scope) { out.remove(it); true }
|
||||||
|
}
|
||||||
|
return ObjImmutableSet(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun mul(scope: Scope, other: Obj): Obj {
|
||||||
|
val right = when (other) {
|
||||||
|
is ObjImmutableSet -> other.data
|
||||||
|
is ObjSet -> other.set
|
||||||
|
else -> scope.raiseIllegalArgument("set operator * requires another set")
|
||||||
|
}
|
||||||
|
return ObjImmutableSet(data.intersect(right))
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun lynonType(): LynonType = LynonType.Set
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
encoder.encodeAnyList(scope, data.toList())
|
||||||
|
}
|
||||||
|
|
||||||
|
fun toMutableSet(): MutableSet<Obj> = LinkedHashSet(data)
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type: ObjClass = object : ObjClass("ImmutableSet", ObjCollection) {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
return ObjImmutableSet(scope.args.list)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj =
|
||||||
|
ObjImmutableSet(decoder.decodeAnyList(scope))
|
||||||
|
}.apply {
|
||||||
|
addFnDoc(
|
||||||
|
name = "size",
|
||||||
|
doc = "Number of elements in this immutable set.",
|
||||||
|
returns = type("lyng.Int"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
thisAs<ObjImmutableSet>().data.size.toObj()
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "intersect",
|
||||||
|
doc = "Intersection with another set. Returns a new immutable set.",
|
||||||
|
params = listOf(ParamDoc("other")),
|
||||||
|
returns = type("lyng.ImmutableSet"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
thisAs<ObjImmutableSet>().mul(requireScope(), args.firstAndOnly())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "iterator",
|
||||||
|
doc = "Iterator over elements of this immutable set.",
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjKotlinObjIterator(thisAs<ObjImmutableSet>().data.iterator())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "union",
|
||||||
|
doc = "Union with another set or iterable. Returns a new immutable set.",
|
||||||
|
params = listOf(ParamDoc("other")),
|
||||||
|
returns = type("lyng.ImmutableSet"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
thisAs<ObjImmutableSet>().plus(requireScope(), args.firstAndOnly())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "subtract",
|
||||||
|
doc = "Subtract another set or iterable from this set. Returns a new immutable set.",
|
||||||
|
params = listOf(ParamDoc("other")),
|
||||||
|
returns = type("lyng.ImmutableSet"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
thisAs<ObjImmutableSet>().minus(requireScope(), args.firstAndOnly())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toMutable",
|
||||||
|
doc = "Create a mutable copy of this immutable set.",
|
||||||
|
returns = type("lyng.Set"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjSet(thisAs<ObjImmutableSet>().toMutableSet())
|
||||||
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toImmutable",
|
||||||
|
doc = "Return this immutable set.",
|
||||||
|
returns = type("lyng.ImmutableSet"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) { thisObj }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -50,6 +50,21 @@ val ObjIterable by lazy {
|
|||||||
ObjList(result)
|
ObjList(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toImmutableList",
|
||||||
|
doc = "Collect elements of this iterable into a new immutable list.",
|
||||||
|
returns = type("lyng.ImmutableList"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
val scope = requireScope()
|
||||||
|
val result = mutableListOf<Obj>()
|
||||||
|
val it = thisObj.invokeInstanceMethod(scope, "iterator")
|
||||||
|
while (it.invokeInstanceMethod(scope, "hasNext").toBool()) {
|
||||||
|
result.add(it.invokeInstanceMethod(scope, "next"))
|
||||||
|
}
|
||||||
|
ObjImmutableList(result)
|
||||||
|
}
|
||||||
|
|
||||||
// it is not effective, but it is open:
|
// it is not effective, but it is open:
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "contains",
|
name = "contains",
|
||||||
@@ -109,6 +124,28 @@ val ObjIterable by lazy {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "toImmutableSet",
|
||||||
|
doc = "Collect elements of this iterable into a new immutable set.",
|
||||||
|
type = type("lyng.ImmutableSet"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = {
|
||||||
|
when (val self = this.thisObj) {
|
||||||
|
is ObjImmutableSet -> self
|
||||||
|
is ObjSet -> ObjImmutableSet(self.set)
|
||||||
|
else -> {
|
||||||
|
val result = mutableSetOf<Obj>()
|
||||||
|
val scope = requireScope()
|
||||||
|
val it = self.invokeInstanceMethod(scope, "iterator")
|
||||||
|
while (it.invokeInstanceMethod(scope, "hasNext").toBool()) {
|
||||||
|
result.add(it.invokeInstanceMethod(scope, "next"))
|
||||||
|
}
|
||||||
|
ObjImmutableSet(result)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
addPropertyDoc(
|
addPropertyDoc(
|
||||||
name = "toMap",
|
name = "toMap",
|
||||||
doc = "Collect pairs into a map using [0] as key and [1] as value for each element.",
|
doc = "Collect pairs into a map using [0] as key and [1] as value for each element.",
|
||||||
@@ -128,6 +165,25 @@ val ObjIterable by lazy {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
|
addPropertyDoc(
|
||||||
|
name = "toImmutableMap",
|
||||||
|
doc = "Collect pairs into an immutable map using [0] as key and [1] as value for each element.",
|
||||||
|
type = type("lyng.ImmutableMap"),
|
||||||
|
moduleName = "lyng.stdlib",
|
||||||
|
getter = {
|
||||||
|
val result = linkedMapOf<Obj, Obj>()
|
||||||
|
val scope = requireScope()
|
||||||
|
this.thisObj.enumerate(scope) { pair ->
|
||||||
|
when (pair) {
|
||||||
|
is ObjMapEntry -> result[pair.key] = pair.value
|
||||||
|
else -> result[pair.getAt(scope, 0)] = pair.getAt(scope, 1)
|
||||||
|
}
|
||||||
|
true
|
||||||
|
}
|
||||||
|
ObjImmutableMap(result)
|
||||||
|
}
|
||||||
|
)
|
||||||
|
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "associateBy",
|
name = "associateBy",
|
||||||
doc = "Build a map from elements using the lambda result as key.",
|
doc = "Build a map from elements using the lambda result as key.",
|
||||||
|
|||||||
@@ -45,18 +45,18 @@ class ObjKotlinIterator(val iterator: Iterator<Any?>) : Obj() {
|
|||||||
}
|
}
|
||||||
boundType = cls
|
boundType = cls
|
||||||
LyngClassBridge.bind(cls) {
|
LyngClassBridge.bind(cls) {
|
||||||
addFun("next") { scope, self, _ ->
|
addFun("next") {
|
||||||
when (self) {
|
when (val self = thisObj) {
|
||||||
is ObjKotlinIterator -> self.iterator.next().toObj()
|
is ObjKotlinIterator -> self.iterator.next().toObj()
|
||||||
is ObjKotlinObjIterator -> self.iterator.next()
|
is ObjKotlinObjIterator -> self.iterator.next()
|
||||||
else -> scope.raiseClassCastError("Expected KotlinIterator, got ${self.objClass.className}")
|
else -> raiseClassCastError("Expected KotlinIterator, got ${self.objClass.className}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
addFun("hasNext") { scope, self, _ ->
|
addFun("hasNext") {
|
||||||
when (self) {
|
when (val self = thisObj) {
|
||||||
is ObjKotlinIterator -> self.iterator.hasNext().toObj()
|
is ObjKotlinIterator -> self.iterator.hasNext().toObj()
|
||||||
is ObjKotlinObjIterator -> self.iterator.hasNext().toObj()
|
is ObjKotlinObjIterator -> self.iterator.hasNext().toObj()
|
||||||
else -> scope.raiseClassCastError("Expected KotlinIterator, got ${self.objClass.className}")
|
else -> raiseClassCastError("Expected KotlinIterator, got ${self.objClass.className}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -29,7 +29,16 @@ import net.sergeych.lynon.LynonDecoder
|
|||||||
import net.sergeych.lynon.LynonEncoder
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
open class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
||||||
|
protected open fun shouldTreatAsSingleElement(scope: Scope, other: Obj): Boolean {
|
||||||
|
if (!other.isInstanceOf(ObjIterable)) return true
|
||||||
|
val declaredElementType = scope.declaredListElementTypeForValue(this)
|
||||||
|
if (declaredElementType != null && matchesTypeDecl(scope, other, declaredElementType)) {
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
if (other is ObjString || other is ObjBuffer) return true
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
if (this === other) return true
|
if (this === other) return true
|
||||||
@@ -86,7 +95,7 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
open override suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
||||||
list[index.toInt()] = newValue
|
list[index.toInt()] = newValue
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -127,7 +136,7 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
other is ObjList ->
|
other is ObjList ->
|
||||||
ObjList((list + other.list).toMutableList())
|
ObjList((list + other.list).toMutableList())
|
||||||
|
|
||||||
other.isInstanceOf(ObjIterable) && other !is ObjString && other !is ObjBuffer -> {
|
!shouldTreatAsSingleElement(scope, other) && other.isInstanceOf(ObjIterable) -> {
|
||||||
val l = other.callMethod<ObjList>(scope, "toList")
|
val l = other.callMethod<ObjList>(scope, "toList")
|
||||||
ObjList((list + l.list).toMutableList())
|
ObjList((list + l.list).toMutableList())
|
||||||
}
|
}
|
||||||
@@ -140,10 +149,10 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override suspend fun plusAssign(scope: Scope, other: Obj): Obj {
|
open override suspend fun plusAssign(scope: Scope, other: Obj): Obj {
|
||||||
if (other is ObjList) {
|
if (other is ObjList) {
|
||||||
list.addAll(other.list)
|
list.addAll(other.list)
|
||||||
} else if (other.isInstanceOf(ObjIterable) && other !is ObjString && other !is ObjBuffer) {
|
} else if (!shouldTreatAsSingleElement(scope, other) && other.isInstanceOf(ObjIterable)) {
|
||||||
val otherList = (other.invokeInstanceMethod(scope, "toList") as ObjList).list
|
val otherList = (other.invokeInstanceMethod(scope, "toList") as ObjList).list
|
||||||
list.addAll(otherList)
|
list.addAll(otherList)
|
||||||
} else {
|
} else {
|
||||||
@@ -152,6 +161,43 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
return this
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun minus(scope: Scope, other: Obj): Obj {
|
||||||
|
val out = list.toMutableList()
|
||||||
|
if (shouldTreatAsSingleElement(scope, other)) {
|
||||||
|
out.remove(other)
|
||||||
|
return ObjList(out)
|
||||||
|
}
|
||||||
|
if (other.isInstanceOf(ObjIterable)) {
|
||||||
|
val toRemove = mutableSetOf<Obj>()
|
||||||
|
other.enumerate(scope) {
|
||||||
|
toRemove += it
|
||||||
|
true
|
||||||
|
}
|
||||||
|
out.removeAll { toRemove.contains(it) }
|
||||||
|
return ObjList(out)
|
||||||
|
}
|
||||||
|
out.remove(other)
|
||||||
|
return ObjList(out)
|
||||||
|
}
|
||||||
|
|
||||||
|
open override suspend fun minusAssign(scope: Scope, other: Obj): Obj {
|
||||||
|
if (shouldTreatAsSingleElement(scope, other)) {
|
||||||
|
list.remove(other)
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
if (other.isInstanceOf(ObjIterable)) {
|
||||||
|
val toRemove = mutableSetOf<Obj>()
|
||||||
|
other.enumerate(scope) {
|
||||||
|
toRemove += it
|
||||||
|
true
|
||||||
|
}
|
||||||
|
list.removeAll { toRemove.contains(it) }
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
list.remove(other)
|
||||||
|
return this
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun contains(scope: Scope, other: Obj): Boolean {
|
override suspend fun contains(scope: Scope, other: Obj): Boolean {
|
||||||
if (net.sergeych.lyng.PerfFlags.PRIMITIVE_FASTOPS) {
|
if (net.sergeych.lyng.PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
// Fast path: int membership in a list of ints (common case in benches)
|
// Fast path: int membership in a list of ints (common case in benches)
|
||||||
@@ -175,7 +221,7 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override val objClass: ObjClass
|
open override val objClass: ObjClass
|
||||||
get() = type
|
get() = type
|
||||||
|
|
||||||
override suspend fun toKotlin(scope: Scope): Any {
|
override suspend fun toKotlin(scope: Scope): Any {
|
||||||
@@ -516,6 +562,14 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
}
|
}
|
||||||
ObjInt((-1).toLong())
|
ObjInt((-1).toLong())
|
||||||
}
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toImmutable",
|
||||||
|
doc = "Create an immutable snapshot of this list.",
|
||||||
|
returns = type("lyng.ImmutableList"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjImmutableList(thisAs<ObjList>().list)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -107,8 +107,12 @@ class ObjMap(val map: MutableMap<Obj, Obj> = mutableMapOf()) : Obj() {
|
|||||||
|
|
||||||
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
if (this === other) return true
|
if (this === other) return true
|
||||||
if (other !is ObjMap) return false
|
val otherSize = when (other) {
|
||||||
if (map.size != other.map.size) return false
|
is ObjMap -> other.map.size
|
||||||
|
is ObjImmutableMap -> other.map.size
|
||||||
|
else -> return false
|
||||||
|
}
|
||||||
|
if (map.size != otherSize) return false
|
||||||
for ((k, v) in map) {
|
for ((k, v) in map) {
|
||||||
val otherV = other.getAt(scope, k)
|
val otherV = other.getAt(scope, k)
|
||||||
if (otherV === ObjNull && !other.contains(scope, k)) return false
|
if (otherV === ObjNull && !other.contains(scope, k)) return false
|
||||||
@@ -131,14 +135,16 @@ class ObjMap(val map: MutableMap<Obj, Obj> = mutableMapOf()) : Obj() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
if (other is ObjMap) {
|
val otherMap = when (other) {
|
||||||
if (map == other.map) return 0
|
is ObjMap -> other.map
|
||||||
if (map.size != other.map.size) return map.size.compareTo(other.map.size)
|
is ObjImmutableMap -> other.map
|
||||||
|
else -> return -1
|
||||||
|
}
|
||||||
|
if (map == otherMap) return 0
|
||||||
|
if (map.size != otherMap.size) return map.size.compareTo(otherMap.size)
|
||||||
// for same size, if they are not equal, we don't have a stable order
|
// for same size, if they are not equal, we don't have a stable order
|
||||||
// but let's try to be consistent
|
// but let's try to be consistent
|
||||||
return map.toString().compareTo(other.map.toString())
|
return map.toString().compareTo(otherMap.toString())
|
||||||
}
|
|
||||||
return -1
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun defaultToString(scope: Scope): ObjString {
|
override suspend fun defaultToString(scope: Scope): ObjString {
|
||||||
@@ -311,6 +317,14 @@ class ObjMap(val map: MutableMap<Obj, Obj> = mutableMapOf()) : Obj() {
|
|||||||
) {
|
) {
|
||||||
ObjKotlinIterator(thisAs<ObjMap>().map.entries.iterator())
|
ObjKotlinIterator(thisAs<ObjMap>().map.entries.iterator())
|
||||||
}
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "toImmutable",
|
||||||
|
doc = "Create an immutable snapshot of this map.",
|
||||||
|
returns = type("lyng.ImmutableMap"),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
ObjImmutableMap(thisAs<ObjMap>().map)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -334,6 +348,11 @@ class ObjMap(val map: MutableMap<Obj, Obj> = mutableMapOf()) : Obj() {
|
|||||||
map[k] = v
|
map[k] = v
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
is ObjImmutableMap -> {
|
||||||
|
for ((k, v) in other.map) {
|
||||||
|
map[k] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
is ObjMapEntry -> {
|
is ObjMapEntry -> {
|
||||||
map[other.key] = other.value
|
map[other.key] = other.value
|
||||||
}
|
}
|
||||||
|
|||||||
Loaded 100 of 136 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user