Compare commits
220
Commits
1.2.0
...
db4f7d0973
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
db4f7d0973 | ||
|
|
a481371349 | ||
|
|
51319fa8b7 | ||
|
|
86ac7eee54 | ||
|
|
18278794d6 | ||
|
|
ac680ceb6c | ||
|
|
6efdfc1964 | ||
|
|
b9af80a1b2 | ||
|
|
bde32ca7b5 | ||
|
|
99ca15d20f | ||
|
|
c14c7d43d9 | ||
|
|
1271f347bd | ||
|
|
4e08339756 | ||
|
|
b32a937636 | ||
|
|
4db0a7fbab | ||
|
|
8b196c7b0c | ||
|
|
54ca886753 | ||
|
|
abbebec153 | ||
|
|
c066dc7150 | ||
|
|
6c0b86f6e6 | ||
|
|
8f1c660f4e | ||
|
|
3ce9029162 | ||
|
|
0caa9849cf | ||
|
|
8314127fdb | ||
|
|
dab0b9f165 | ||
|
|
6aa23e8ef3 | ||
|
|
c035b4c34c | ||
|
|
9d508e219f | ||
|
|
b49f291bff | ||
|
|
ae88898f58 | ||
|
|
565dbf98ed | ||
|
|
5305ced89f | ||
|
|
b2d5897aa8 | ||
|
|
0b94b46d40 | ||
|
|
541738646f | ||
|
|
f0dc0d2396 | ||
|
|
7850d5fbde | ||
|
|
cde7cf2caf | ||
|
|
473a5dd6ed | ||
|
|
694d15c69d | ||
|
|
780227a229 | ||
|
|
8a7582891a | ||
|
|
5b1a8af4e3 | ||
|
|
58581d6bf0 | ||
|
|
e2f503744d | ||
|
|
d739833c57 | ||
|
|
5fd322a43e | ||
|
|
3a46e59ec8 | ||
|
|
026b023892 | ||
|
|
f9fe3d1186 | ||
|
|
f5ced02505 | ||
|
|
7ea67d4816 | ||
|
|
7b70a37e90 | ||
|
|
a557d0cc59 | ||
|
|
40a55f298e | ||
|
|
b857686d7d | ||
|
|
eb58720365 | ||
|
|
3391da595f | ||
|
|
62975ff511 | ||
|
|
b5bb68d042 | ||
|
|
c16c0d7ebd | ||
|
|
78d8e546d5 | ||
|
|
79bece94a5 | ||
|
|
3b290116b8 | ||
|
|
c35efdc2ae | ||
|
|
d82a9bb930 | ||
|
|
7a286f2e06 | ||
|
|
de9ac14e33 | ||
|
|
40de53f688 | ||
|
|
c31343a040 | ||
|
|
9db5b12c31 | ||
|
|
7e538ed8aa | ||
|
|
566ddc6bde | ||
|
|
afbd6e45b9 | ||
|
|
6220e982a0 | ||
|
|
43a6a7aaf4 | ||
|
|
308a9c0bcb | ||
|
|
24c4ed85b4 | ||
|
|
1fab2702dd | ||
|
|
47654aee38 | ||
|
|
862486e0e8 | ||
|
|
ce0393b309 | ||
|
|
0f1748e053 | ||
|
|
6539b9deff | ||
|
|
ac2a734998 | ||
|
|
ec64d7309c | ||
|
|
874f8fc205 | ||
|
|
54c6fca0e8 | ||
|
|
c5bf4e5039 | ||
|
|
c9da0b256f | ||
|
|
51b397686d | ||
|
|
be337144eb | ||
|
|
824a58bbc5 | ||
|
|
523b9d338b | ||
|
|
8f60a84e3b | ||
|
|
d363501081 | ||
|
|
ffb22d0875 | ||
|
|
2e9e0921bf | ||
|
|
f9c29e742a | ||
|
|
348052991c | ||
|
|
0331ea22f7 | ||
|
|
f6b6395424 | ||
|
|
2622fde41b | ||
|
|
55470795f0 | ||
|
|
eb6facd58d | ||
|
|
7c60f02868 | ||
|
|
eb869dc112 | ||
|
|
c5dbf6ad51 | ||
|
|
55b2162fa3 | ||
|
|
a29acb6000 | ||
|
|
cf3ca342f4 | ||
|
|
431faa9262 | ||
|
|
29aa490748 | ||
|
|
84554ab7c6 | ||
|
|
64fa305aa7 | ||
|
|
eaa5713eaf | ||
|
|
615dc026f7 | ||
|
|
4b66454bf3 | ||
|
|
d6e1e74b48 | ||
|
|
3210205061 | ||
|
|
4c966eb63e | ||
|
|
68122df6d7 | ||
|
|
ecf64dcbc3 | ||
|
|
89cf2c1612 | ||
|
|
9319add9c0 | ||
|
|
a266df6035 | ||
|
|
df48a06311 | ||
|
|
9bc59f4787 | ||
|
|
e16f054010 | ||
|
|
72a060d42f | ||
|
|
bca5912942 | ||
|
|
b5f20e1650 | ||
|
|
40b6ec023c | ||
|
|
e2d359f7a7 | ||
|
|
e4d0730b04 | ||
|
|
20b8464591 | ||
|
|
d8e18e4a0c | ||
|
|
e346e7e56e | ||
|
|
0e069382a2 | ||
|
|
ac8277d374 | ||
|
|
e143f31f3d | ||
|
|
91624a30b8 | ||
|
|
55e06f04b2 | ||
|
|
a8f9ddb60c | ||
|
|
7f7cf0d904 | ||
|
|
104fd6b517 | ||
|
|
6c36314ed8 | ||
|
|
8cec5cf7ec | ||
|
|
6a0f6b3db5 | ||
|
|
079bdb44a6 | ||
|
|
238c2177b6 | ||
|
|
212a3a5b3f | ||
|
|
a73c118c77 | ||
|
|
eaee738dee | ||
|
|
8407dbe880 | ||
|
|
79de950fcc | ||
|
|
c7e2455340 | ||
|
|
f788f79d4b | ||
|
|
f2b99fe23b | ||
|
|
e2a8de97f5 | ||
|
|
70d05f7987 | ||
|
|
54d882ce89 | ||
|
|
3250e5e556 | ||
|
|
1eb8793e35 | ||
|
|
5d5453d994 | ||
|
|
297810154f | ||
|
|
f22efaab19 | ||
|
|
b9d3af56bb | ||
|
|
ac5d1fa65a | ||
|
|
2c2468b672 | ||
|
|
938503fdd4 | ||
|
|
81d86f4c3a | ||
|
|
a4fc5ac6d5 | ||
|
|
aebe0890d8 | ||
|
|
951ce989a6 | ||
|
|
9a15470cdb | ||
|
|
490faea2ba | ||
|
|
250220a42f | ||
|
|
63bcb91504 | ||
|
|
7b3d92beb9 | ||
|
|
8dfdbaa0a0 | ||
|
|
37a8831fd7 | ||
|
|
2311cfc224 | ||
|
|
bef94d3bc5 | ||
|
|
7de856fc62 | ||
|
|
2f4462858b | ||
|
|
144082733c | ||
|
|
72901d9d4c | ||
|
|
059e366787 | ||
|
|
b4598bff98 | ||
|
|
fd1548c86c | ||
|
|
9c56cf751b | ||
|
|
8ae6eb8d69 | ||
|
|
3d9170d677 | ||
|
|
c8a8b12dfc | ||
|
|
6560457e3d | ||
|
|
ea877748e5 | ||
|
|
d8b00a805c | ||
|
|
f42ea0a04c | ||
|
|
bc9e557814 | ||
|
|
b674ee7c18 | ||
|
|
a4f41f17bf | ||
|
|
96947aac50 | ||
|
|
98d6ffe998 | ||
|
|
74d73540c6 | ||
|
|
9b580bafb6 | ||
|
|
062f9e7866 | ||
|
|
717a79aca2 | ||
|
|
7b1ba71ef0 | ||
|
|
8b94432f66 | ||
|
|
338dc00573 | ||
|
|
d0230c5b89 | ||
|
|
5dc2159024 | ||
|
|
0759346e4b | ||
|
|
f848d79d39 | ||
|
|
52a3a96e3f | ||
|
|
b7dfda2f5d | ||
|
|
05e15e8e42 | ||
|
|
d4bb186f85 | ||
|
|
7bc17037f9 |
No files matched your search
@@ -0,0 +1,22 @@
|
|||||||
|
# AI Agent Notes
|
||||||
|
|
||||||
|
## Kotlin/Wasm generation guardrails
|
||||||
|
- 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).
|
||||||
|
- If you need a wrapper for delegated properties, check for `getValue` explicitly and return a concrete `Statement` object when missing; avoid `onNotFoundResult` lambdas.
|
||||||
|
- If wasmJs browser tests hang, first run `:lynglib:wasmJsNodeTest` and look for wasm compilation errors; hangs usually mean module instantiation failed.
|
||||||
|
- Do not increase test timeouts to mask wasm generation errors; fix the invalid IR instead.
|
||||||
|
|
||||||
|
## Type inference notes (notes/new_lyng_type_system_spec.md)
|
||||||
|
- Nullability is Kotlin-style: `T` non-null, `T?` nullable, `!!` asserts non-null.
|
||||||
|
- `void` is a singleton of class `Void` (syntax sugar for return type).
|
||||||
|
- Object members are always allowed even on unknown types; non-Object members require explicit casts. Remove `inspect` from Object and use `toInspectString()` instead.
|
||||||
|
- Type expression checks: `x is T` is value instance check; `T1 is T2` is type-subset; `A in T` means `A` is subset of `T`; `==` is structural type equality.
|
||||||
|
- Type aliases: `type Name = TypeExpr` (generic allowed) expand to their underlying type expressions; no nominal distinctness.
|
||||||
|
- Do not reintroduce bytecode fallback opcodes (e.g., `GET_NAME`, `EVAL_*`, `CALL_FALLBACK`) or runtime name-resolution fallbacks; all symbol resolution must stay compile-time only.
|
||||||
|
|
||||||
|
## Bytecode frame-first migration plan
|
||||||
|
- Treat frame slots as the only storage for locals/temps by default; avoid pre-creating scope slot mappings for compiled functions.
|
||||||
|
- 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).
|
||||||
|
- Avoid PUSH_SCOPE/POP_SCOPE in bytecode for loops/functions unless dynamic name access or Kotlin reflection is requested.
|
||||||
+6
-1
@@ -2,6 +2,11 @@
|
|||||||
|
|
||||||
### Unreleased
|
### Unreleased
|
||||||
|
|
||||||
|
- Language: Refined `protected` visibility rules
|
||||||
|
- Ancestor classes can now access `protected` members of their descendants, provided the ancestor also defines or inherits a member with the same name (indicating an override of a member known to the ancestor).
|
||||||
|
- This allows patterns where a base class calls a `protected` method that is implemented in a subclass.
|
||||||
|
- Fixed a regression where self-calls to unmangled members sometimes bypassed visibility checks incorrectly; these are now handled by the refined logic.
|
||||||
|
|
||||||
- Language: Added `return` statement
|
- Language: Added `return` statement
|
||||||
- `return [expression]` exits the innermost enclosing callable (function or lambda).
|
- `return [expression]` exits the innermost enclosing callable (function or lambda).
|
||||||
- Supports non-local returns using `@label` syntax (e.g., `return@outer 42`).
|
- Supports non-local returns using `@label` syntax (e.g., `return@outer 42`).
|
||||||
@@ -96,7 +101,7 @@
|
|||||||
- Header-specified constructor arguments are passed to direct bases.
|
- Header-specified constructor arguments are passed to direct bases.
|
||||||
- Visibility enforcement under MI:
|
- Visibility enforcement under MI:
|
||||||
- `private` visible only inside the declaring class body.
|
- `private` visible only inside the declaring class body.
|
||||||
- `protected` visible inside the declaring class and any of its transitive subclasses; unrelated contexts cannot access it (qualification/casts do not bypass).
|
- `protected` visible inside the declaring class and its transitive subclasses. Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Unrelated contexts cannot access it (qualification/casts do not bypass).
|
||||||
- Diagnostics improvements:
|
- Diagnostics improvements:
|
||||||
- Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
|
- Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
|
||||||
- Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.
|
- Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.
|
||||||
|
|||||||
+15
-4
@@ -14,10 +14,12 @@ High-density specification for LLMs. Reference this for all Lyng code generation
|
|||||||
4. `void` (if loop body never executed and no `else`).
|
4. `void` (if loop body never executed and no `else`).
|
||||||
- **Implicit Coroutines**: All functions are coroutines. No `async/await`. Use `launch { ... }` (returns `Deferred`) or `flow { ... }`.
|
- **Implicit Coroutines**: All functions are coroutines. No `async/await`. Use `launch { ... }` (returns `Deferred`) or `flow { ... }`.
|
||||||
- **Variables**: `val` (read-only), `var` (mutable). Supports late-init `val` in classes (must be assigned in `init` or body).
|
- **Variables**: `val` (read-only), `var` (mutable). Supports late-init `val` in classes (must be assigned in `init` or body).
|
||||||
|
- **Serialization**: Use `@Transient` attribute before `val`/`var` or constructor parameters to exclude them from Lynon/JSON serialization. Transient fields are also ignored during `==` structural equality checks.
|
||||||
- **Null Safety**: `?` (nullable type), `?.` (safe access), `?( )` (safe invoke), `?{ }` (safe block invoke), `?[ ]` (safe index), `?:` or `??` (elvis), `?=` (assign-if-null).
|
- **Null Safety**: `?` (nullable type), `?.` (safe access), `?( )` (safe invoke), `?{ }` (safe block invoke), `?[ ]` (safe index), `?:` or `??` (elvis), `?=` (assign-if-null).
|
||||||
- **Equality**: `==` (equals), `!=` (not equals), `===` (ref identity), `!==` (ref not identity).
|
- **Equality**: `==` (equals), `!=` (not equals), `===` (ref identity), `!==` (ref not identity).
|
||||||
- **Comparison**: `<`, `>`, `<=`, `>=`, `<=>` (shuttle/spaceship, returns -1, 0, 1).
|
- **Comparison**: `<`, `>`, `<=`, `>=`, `<=>` (shuttle/spaceship, returns -1, 0, 1).
|
||||||
- **Destructuring**: `val [a, b, rest...] = list`. Supports nested `[a, [b, c]]` and splats.
|
- **Destructuring**: `val [a, b, rest...] = list`. Supports nested `[a, [b, c]]` and splats.
|
||||||
|
- **Compile-Time Resolution Only**: All names/members must resolve at compile time. No runtime name lookup or fallback opcodes.
|
||||||
|
|
||||||
## 2. Object-Oriented Programming (OOP)
|
## 2. Object-Oriented Programming (OOP)
|
||||||
- **Multiple Inheritance**: Supported with **C3 MRO** (Python-style). Diamond-safe.
|
- **Multiple Inheritance**: Supported with **C3 MRO** (Python-style). Diamond-safe.
|
||||||
@@ -32,10 +34,19 @@ High-density specification for LLMs. Reference this for all Lyng code generation
|
|||||||
val area get = π * r * r
|
val area get = π * r * r
|
||||||
```
|
```
|
||||||
- **Mandatory `override`**: Required for all members existing in the ancestor chain.
|
- **Mandatory `override`**: Required for all members existing in the ancestor chain.
|
||||||
- **Visibility**: `public` (default), `protected` (subclasses), `private` (this class instance only). `private set` / `protected set` allowed on properties.
|
- **Visibility**: `public` (default), `protected` (subclasses and ancestors for overrides), `private` (this class instance only). `private set` / `protected set` allowed on properties.
|
||||||
- **Disambiguation**: `this@Base.member()` or `(obj as Base).member()`. `as` returns a qualified view.
|
- **Disambiguation**: `this@Base.member()` or `(obj as Base).member()`. `as` returns a qualified view.
|
||||||
- **Abstract/Interface**: `interface` is a synonym for `abstract class`. Both support state and constructors.
|
- **Abstract/Interface**: `interface` is a synonym for `abstract class`. Both support state and constructors.
|
||||||
- **Extensions**: `fun Class.ext()` or `val Class.ext get = ...`. Scope-isolated.
|
- **Extensions**: `fun Class.ext()` or `val Class.ext get = ...`. Scope-isolated.
|
||||||
|
- **Member Access**: Object members (`toString`, `toInspectString`, `let`, `also`, `apply`, `run`) are allowed on unknown types; all other members require a statically known receiver type or explicit cast.
|
||||||
|
|
||||||
|
## 2.1 Type System (2026)
|
||||||
|
- **Root Type**: Everything is an `Object` (root of the hierarchy).
|
||||||
|
- **Nullability**: Non-null by default (`T`), nullable with `T?`, `!!` asserts non-null.
|
||||||
|
- **Untyped params**: `fun foo(x)` -> `x: Object`, `fun foo(x?)` -> `x: Object?`.
|
||||||
|
- **Untyped vars**: `var x` is `Unset` until first assignment locks the type.
|
||||||
|
- **Inference**: List/map literals infer union element types; empty list is `List<Object>`, empty map is `{:}`.
|
||||||
|
- **Generics**: Bounds with `T: A & B` or `T: A | B`; variance uses `out`/`in`.
|
||||||
|
|
||||||
## 3. Delegation (`by`)
|
## 3. Delegation (`by`)
|
||||||
Unified model for `val`, `var`, and `fun`.
|
Unified model for `val`, `var`, and `fun`.
|
||||||
@@ -62,11 +73,11 @@ Delegate Methods:
|
|||||||
- **Collections**: `List` ( `[a, b]` ), `Map` ( `Map(k => v)` ), `Set` ( `Set(a, b)` ). `MapEntry` ( `k => v` ).
|
- **Collections**: `List` ( `[a, b]` ), `Map` ( `Map(k => v)` ), `Set` ( `Set(a, b)` ). `MapEntry` ( `k => v` ).
|
||||||
|
|
||||||
## 5. Patterns & Shorthands
|
## 5. Patterns & Shorthands
|
||||||
- **Map Literals**: `{ key: value, identifier: }` (identifier shorthand `x:` is `x: x`). Empty map is `Map()`.
|
- **Map Literals**: `{ key: value, identifier: }` (identifier shorthand `x:` is `x: x`). Empty map is `{:}`.
|
||||||
- **Named Arguments**: `fun(y: 10, x: 5)`. Shorthand: `Point(x:, y:)`.
|
- **Named Arguments**: `fun(y: 10, x: 5)`. Shorthand: `Point(x:, y:)`.
|
||||||
- **Varargs & Splats**: `fun f(args...)`, `f(...otherList)`.
|
- **Varargs & Splats**: `fun f(args...)`, `f(...otherList)`.
|
||||||
- **Labels**: `loop@ for(x in list) { if(x == 0) break@loop }`.
|
- **Labels**: `loop@ for(x in list) { if(x == 0) break@loop }`.
|
||||||
- **Dynamic**: `val d = dynamic { get { name -> ... } }` allows `d.anyName`.
|
- **Dynamic**: `val d = dynamic { get { name -> ... } }` allows `d.anyName` via explicit dynamic handler (not implicit fallback).
|
||||||
|
|
||||||
## 6. Operators & Methods to Overload
|
## 6. Operators & Methods to Overload
|
||||||
| Op | Method | Op | Method |
|
| Op | Method | Op | Method |
|
||||||
@@ -93,7 +104,7 @@ m += "c" => 3
|
|||||||
val [first, middle..., last] = [1, 2, 3, 4, 5]
|
val [first, middle..., last] = [1, 2, 3, 4, 5]
|
||||||
|
|
||||||
// Safe Navigation and Elvis
|
// Safe Navigation and Elvis
|
||||||
val companyName = person?.job?.company?.name ?? "Freelancer"
|
val companyName = person?.job?.company?.name ?: "Freelancer"
|
||||||
```
|
```
|
||||||
|
|
||||||
## 8. Standard Library Discovery
|
## 8. Standard Library Discovery
|
||||||
|
|||||||
@@ -25,6 +25,16 @@ Point(x:, y:).dist() //< 5
|
|||||||
fun swapEnds(first, args..., last, f) {
|
fun swapEnds(first, args..., last, f) {
|
||||||
f( last, ...args, first)
|
f( last, ...args, first)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
```
|
```
|
||||||
|
|
||||||
- extremely simple Kotlin integration on any platform (JVM, JS, WasmJS, Lunux, MacOS, iOS, Windows)
|
- extremely simple Kotlin integration on any platform (JVM, JS, WasmJS, Lunux, MacOS, iOS, Windows)
|
||||||
@@ -38,6 +48,7 @@ fun swapEnds(first, args..., last, f) {
|
|||||||
|
|
||||||
- [Language home](https://lynglang.com)
|
- [Language home](https://lynglang.com)
|
||||||
- [introduction and tutorial](docs/tutorial.md) - start here please
|
- [introduction and tutorial](docs/tutorial.md) - start here please
|
||||||
|
- [What's New in 1.3](docs/whats_new_1_3.md)
|
||||||
- [Testing and Assertions](docs/Testing.md)
|
- [Testing and Assertions](docs/Testing.md)
|
||||||
- [Filesystem and Processes (lyngio)](docs/lyngio.md)
|
- [Filesystem and Processes (lyngio)](docs/lyngio.md)
|
||||||
- [Return Statement](docs/return_statement.md)
|
- [Return Statement](docs/return_statement.md)
|
||||||
@@ -45,6 +56,7 @@ fun swapEnds(first, args..., last, f) {
|
|||||||
- [Samples directory](docs/samples)
|
- [Samples directory](docs/samples)
|
||||||
- [Formatter (core + CLI + IDE)](docs/formatter.md)
|
- [Formatter (core + CLI + IDE)](docs/formatter.md)
|
||||||
- [Books directory](docs)
|
- [Books directory](docs)
|
||||||
|
- [AI agent guidance](AGENTS.md)
|
||||||
|
|
||||||
## Integration in Kotlin multiplatform
|
## Integration in Kotlin multiplatform
|
||||||
|
|
||||||
@@ -231,4 +243,4 @@ __Sergey Chernov__ @sergeych: Initial idea and architecture, language concept, d
|
|||||||
|
|
||||||
__Yulia Nezhinskaya__ @AlterEgoJuliaN: System analysis, math and features design.
|
__Yulia Nezhinskaya__ @AlterEgoJuliaN: System analysis, math and features design.
|
||||||
|
|
||||||
[parallelism]: docs/parallelism.md
|
[parallelism]: docs/parallelism.md
|
||||||
@@ -0,0 +1,143 @@
|
|||||||
|
# Bytecode Migration Plan
|
||||||
|
|
||||||
|
Goal: migrate the compiler so all values live in frames/bytecode, keeping JVM tests green after each step.
|
||||||
|
|
||||||
|
## Steps
|
||||||
|
|
||||||
|
- [x] Step 1: Module/import slots seeded into module frame; bytecode module resolution works across closures.
|
||||||
|
- [x] Step 2: Allow implicit/qualified `this` member refs to compile to bytecode.
|
||||||
|
- [x] Enable bytecode for `ImplicitThisMethodCallRef`, `QualifiedThisMethodSlotCallRef`, `QualifiedThisFieldSlotRef`.
|
||||||
|
- [x] Keep unsupported cases blocked: `ClassScopeMemberRef`, dynamic receivers, delegated members.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
- [x] Step 3: Bytecode support for `try/catch/finally`.
|
||||||
|
- [x] Implement bytecode emission for try/catch and finally blocks.
|
||||||
|
- [x] Preserve existing error/stack semantics.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
|
||||||
|
## Remaining Migration (prioritized)
|
||||||
|
|
||||||
|
- [x] Step 4: Allow bytecode wrapping for supported declaration statements.
|
||||||
|
- [x] Enable `DestructuringVarDeclStatement` and `ExtensionPropertyDeclStatement` in `containsUnsupportedForBytecode`.
|
||||||
|
- [x] Keep JVM tests green before commit.
|
||||||
|
- [x] Step 5: Enable bytecode for delegated var declarations.
|
||||||
|
- [x] Revisit `containsDelegatedRefs` guard for `DelegatedVarDeclStatement`.
|
||||||
|
- [x] Ensure delegate binding uses explicit `Statement` objects (no inline suspend lambdas).
|
||||||
|
- [x] Keep JVM tests green before commit.
|
||||||
|
- [x] Step 6: Map literal spread in bytecode.
|
||||||
|
- [x] Replace `MapLiteralEntry.Spread` bytecode exception with runtime `putAll`/merge logic.
|
||||||
|
- [x] Step 7: Class-scope member refs in bytecode.
|
||||||
|
- [x] Support `ClassScopeMemberRef` without scope-map fallback.
|
||||||
|
- [x] Step 8: ObjDynamic member access in bytecode.
|
||||||
|
- [x] Allow dynamic receiver field/method lookup without falling back to interpreter.
|
||||||
|
- [x] Step 9: Module-level bytecode execution.
|
||||||
|
- [x] Compile `Script` bodies to bytecode instead of interpreting at module scope.
|
||||||
|
- [x] Keep import/module slot seeding in frame-only flow.
|
||||||
|
- [x] Step 10: Bytecode for declaration statements in module scripts.
|
||||||
|
- [x] Support `ClassDeclStatement`, `FunctionDeclStatement`, `EnumDeclStatement` in bytecode compilation.
|
||||||
|
- [x] Keep a mixed execution path for declarations (module bytecode calls statement bodies via `CALL_SLOT`).
|
||||||
|
- [x] Ensure module object member refs compile as instance access (not class-scope).
|
||||||
|
- [x] Step 11: Destructuring assignment bytecode.
|
||||||
|
- [x] Handle `[a, b] = expr` (AssignRef target `ListLiteralRef`) without interpreter fallback.
|
||||||
|
- [x] Step 12: Optional member assign-ops and inc/dec in bytecode.
|
||||||
|
- [x] Support `a?.b += 1` and `a?.b++` for `FieldRef` targets.
|
||||||
|
- [x] Fix post-inc return value for object slots stored in scope frames.
|
||||||
|
- [x] Handle optional receivers for member assign-ops and inc/dec without evaluating operands on null.
|
||||||
|
- [x] Support class-scope and index optional inc/dec paths in bytecode.
|
||||||
|
- [x] Step 13: Qualified `this` value refs in bytecode.
|
||||||
|
- [x] Compile `QualifiedThisRef` (`this@Type`) via `LOAD_THIS_VARIANT`.
|
||||||
|
- [x] Add a JVM test that evaluates `this@Type` as a value inside nested classes.
|
||||||
|
- [x] Step 14: Fast local ref reads in bytecode.
|
||||||
|
- [x] Support `FastLocalVarRef` reads with the same slot resolution as `LocalVarRef`.
|
||||||
|
- [x] If `BoundLocalVarRef` is still emitted, map it to a direct slot read instead of failing.
|
||||||
|
- [x] Add a JVM test that exercises fast-local reads in a bytecode-compiled function.
|
||||||
|
- [x] Step 15: Class-scope `?=` in bytecode.
|
||||||
|
- [x] Handle `C.x ?= v` and `C?.x ?= v` for class-scope members without falling back.
|
||||||
|
- [x] Add a JVM test for class-scope `?=` on static vars.
|
||||||
|
- [x] Step 16: Remove dead `ToBoolStatement`.
|
||||||
|
- [x] Confirm no parser/compiler paths construct `ToBoolStatement` and delete it plus interpreter hooks.
|
||||||
|
- [x] Keep JVM tests green after removal.
|
||||||
|
- [x] Step 17: Callable property calls in bytecode.
|
||||||
|
- [x] Support `CallRef` where the target is a `FieldRef` (e.g., `(obj.fn)()`), keeping compile-time resolution.
|
||||||
|
- [x] Add a JVM test for a callable property call compiled to bytecode.
|
||||||
|
- [x] Step 18: Delegated member access in bytecode.
|
||||||
|
- [x] Remove `containsDelegatedRefs` guard once bytecode emits delegated get/set/call correctly.
|
||||||
|
- [x] Add JVM coverage for delegated member get/set/call in bytecode.
|
||||||
|
- [x] Step 19: Unknown receiver member access in bytecode.
|
||||||
|
- [x] Reject Object/unknown receiver member calls without explicit cast or Dynamic.
|
||||||
|
- [x] Add union-member dispatch with ordered type checks and runtime mismatch error.
|
||||||
|
- [x] Add JVM tests for unknown receiver and union member access.
|
||||||
|
- [x] Step 20: Bytecode support for `NopStatement`.
|
||||||
|
- [x] Allow `NopStatement` in `containsUnsupportedForBytecode`.
|
||||||
|
- [x] Emit `ObjVoid` directly in bytecode for `NopStatement` in statement/value contexts.
|
||||||
|
- [x] Add a JVM test that exercises a code path returning `NopStatement` in bytecode (e.g., static class member decl in class body).
|
||||||
|
- [x] Step 21: Union mismatch path in bytecode.
|
||||||
|
- [x] Replace `UnionTypeMismatchStatement` branch with a bytecode-compilable throw path (no custom `StatementRef` that blocks bytecode).
|
||||||
|
- [x] Add a JVM test that forces the union mismatch at runtime and asserts the error message.
|
||||||
|
- [x] Step 22: Delegated local slots in bytecode.
|
||||||
|
- [x] Support reads/writes/assign-ops/inc/dec for delegated locals (`LocalSlotRef.isDelegated`) in `BytecodeCompiler`.
|
||||||
|
- [x] Remove `containsDelegatedRefs` guard once delegated locals are bytecode-safe.
|
||||||
|
- [x] Add JVM tests that use delegated locals inside bytecode-compiled functions.
|
||||||
|
- [x] Step 23: Refactor delegated locals to keep delegate objects in frame slots.
|
||||||
|
- [x] Add bytecode ops to bind/get/set delegated locals without scope storage.
|
||||||
|
- [x] Store delegated locals in frame slots and compile get/set/assign ops with new ops.
|
||||||
|
- [x] Preserve reflection facade by syncing delegated locals into scope only when needed.
|
||||||
|
- [x] Step 24: Remove `ASSIGN_SCOPE_SLOT` now that delegated locals are always frame-backed.
|
||||||
|
- [x] Force delegated locals into local slots (even module) and avoid scope-slot resolution.
|
||||||
|
- [x] Drop opcode/runtime support for `ASSIGN_SCOPE_SLOT`.
|
||||||
|
|
||||||
|
## Frame-Only Execution (new, before interpreter removal)
|
||||||
|
|
||||||
|
- [x] Step 24A: Bytecode capture tables for lambdas (compiler only).
|
||||||
|
- [x] Emit per-lambda capture tables containing (ownerFrameKind, ownerSlotId).
|
||||||
|
- [x] Create captures only when detected; do not allocate scope slots.
|
||||||
|
- [x] Add disassembler output for capture tables.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
- [x] Step 24B: Frame-slot captures in bytecode runtime.
|
||||||
|
- [x] Build lambdas from bytecode + capture table (no capture names).
|
||||||
|
- [x] Read captured values via `FrameSlotRef` only.
|
||||||
|
- [x] Forbid `resolveCaptureRecord` in bytecode paths; keep only in interpreter.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
- [x] Step 24C: Remove scope local mirroring in bytecode execution.
|
||||||
|
- [x] Remove/disable any bytecode runtime code that writes locals into Scope for execution.
|
||||||
|
- [x] Keep Scope creation only for reflection/Kotlin interop paths.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
- [x] Step 24D: Eliminate `ClosureScope` usage on bytecode execution paths.
|
||||||
|
- [x] Avoid `ClosureScope` in bytecode-related call paths (Block/Lambda/ObjDynamic/ObjProperty).
|
||||||
|
- [x] Keep interpreter path using `ClosureScope` until interpreter removal.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
- [x] Step 24E: Isolate interpreter-only capture logic.
|
||||||
|
- [x] Mark `resolveCaptureRecord` paths as interpreter-only.
|
||||||
|
- [x] Guard or delete any bytecode path that tries to sync captures into scopes.
|
||||||
|
- [x] JVM tests must be green before commit.
|
||||||
|
|
||||||
|
## Interpreter Removal (next)
|
||||||
|
|
||||||
|
- [ ] Step 25: Replace Statement-based declaration calls in bytecode.
|
||||||
|
- [x] Add bytecode const/op for enum declarations (no `Statement` objects in constants).
|
||||||
|
- [x] Add bytecode const/op for class declarations (no `Statement` objects in constants).
|
||||||
|
- [x] Add bytecode const/op for function declarations (no `Statement` objects in constants).
|
||||||
|
- [x] Replace `emitStatementCall` usage for `EnumDeclStatement`.
|
||||||
|
- [x] Replace `emitStatementCall` usage for `ClassDeclStatement`.
|
||||||
|
- [x] Replace `emitStatementCall` usage for `FunctionDeclStatement`.
|
||||||
|
- [x] Add JVM disasm coverage to ensure module init has no `CALL_SLOT` to `Callable@...` for declarations.
|
||||||
|
- [ ] Step 26: Bytecode-backed lambdas (remove `ValueFnRef` runtime execution).
|
||||||
|
- [x] Compile lambda bodies to bytecode and emit an opcode to create a callable from bytecode + capture plan.
|
||||||
|
- [x] Remove `containsValueFnRef` helper now that lambdas are bytecode-backed.
|
||||||
|
- [x] Remove `forceScopeSlots` branches once no bytecode paths depend on scope slots.
|
||||||
|
- [x] Add JVM tests for captured locals and delegated locals inside lambdas on the bytecode path.
|
||||||
|
- [x] Step 27: Remove interpreter opcodes and constants from bytecode runtime.
|
||||||
|
- [x] Delete `BytecodeConst.ValueFn`, `CmdMakeValueFn`, and `MAKE_VALUE_FN`.
|
||||||
|
- [x] Delete `BytecodeConst.StatementVal`, `CmdEvalStmt`, and `EVAL_STMT`.
|
||||||
|
- [x] Add bytecode-backed `::class` via `ClassOperatorRef` + `GET_OBJ_CLASS` to avoid ValueFn for class operator.
|
||||||
|
- [x] Add a bytecode fallback reporter hook for lambdas to locate remaining non-bytecode cases.
|
||||||
|
- [x] Remove `emitStatementCall`/`emitStatementEval` once unused.
|
||||||
|
- [ ] Step 28: Scope as facade only.
|
||||||
|
- [x] Audit bytecode execution paths for `Statement.execute` usage and remove remaining calls.
|
||||||
|
- [x] Keep scope sync only for reflection/Kotlin interop, not for execution.
|
||||||
|
- [x] Replace bytecode entry seeding from Scope with frame-only arg/local binding.
|
||||||
|
|
||||||
|
## Notes
|
||||||
|
|
||||||
|
- Keep imports bound to module frame slots; no scope map writes for imports.
|
||||||
|
- Avoid inline suspend lambdas in compiler hot paths; use explicit `object : Statement()`.
|
||||||
|
- Do not reintroduce bytecode fallback opcodes; all symbol resolution remains compile-time only.
|
||||||
@@ -0,0 +1,280 @@
|
|||||||
|
# Lyng Bytecode VM Spec v0 (Draft)
|
||||||
|
|
||||||
|
This document describes a register-like (3-address) bytecode for Lyng with
|
||||||
|
dynamic slot width (8/16/32-bit slot IDs), a slot-tail argument model, and
|
||||||
|
typed lanes for Obj/Int/Real/Bool. The VM is intended to run as a suspendable
|
||||||
|
interpreter and fall back to the existing AST execution when needed.
|
||||||
|
|
||||||
|
## 1) Frame & Slot Model
|
||||||
|
|
||||||
|
### Frame metadata
|
||||||
|
- localCount: number of local slots for this function (fixed at compile time).
|
||||||
|
- argCount: number of arguments passed at call time.
|
||||||
|
- scopeSlotNames: optional debug names for scope slots (locals/params), aligned to slot mapping.
|
||||||
|
- argBase = localCount.
|
||||||
|
|
||||||
|
### Slot layout
|
||||||
|
slots[0 .. localCount-1] locals
|
||||||
|
slots[localCount .. localCount+argCount-1] arguments
|
||||||
|
|
||||||
|
### Typed lanes
|
||||||
|
- slotType[]: UNKNOWN/OBJ/INT/REAL/BOOL
|
||||||
|
- objSlots[], intSlots[], realSlots[], boolSlots[]
|
||||||
|
- A slot is a logical index; active lane is selected by slotType.
|
||||||
|
|
||||||
|
### Parameter access
|
||||||
|
- param i => slot localCount + i
|
||||||
|
- variadic extra => slot localCount + declaredParamCount + k
|
||||||
|
|
||||||
|
### Debug metadata (optional)
|
||||||
|
- scopeSlotNames: array sized scopeSlotCount, each entry nullable.
|
||||||
|
- Intended for disassembly/debug tooling; VM semantics do not depend on it.
|
||||||
|
|
||||||
|
### Constant pool extras
|
||||||
|
- SlotPlan: map of name -> slot index, used by PUSH_SCOPE to pre-allocate and map loop locals.
|
||||||
|
- CallArgsPlan: ordered argument specs (name/splat) + tailBlock flag, used when argCount has the plan flag set.
|
||||||
|
|
||||||
|
## 2) Slot ID Width
|
||||||
|
|
||||||
|
Per frame, select:
|
||||||
|
- 8-bit if localCount + argCount < 256
|
||||||
|
- 16-bit if < 65536
|
||||||
|
- 32-bit otherwise
|
||||||
|
|
||||||
|
The decoder uses a dedicated loop per width. All slot operands are expanded to
|
||||||
|
Int internally.
|
||||||
|
|
||||||
|
## 3) CALL Semantics (Model A)
|
||||||
|
|
||||||
|
Instruction:
|
||||||
|
CALL_DIRECT fnId, argBase, argCount, dst
|
||||||
|
|
||||||
|
Behavior:
|
||||||
|
- Allocate a callee frame sized localCount + argCount.
|
||||||
|
- Copy caller slots [argBase .. argBase+argCount-1] into callee slots
|
||||||
|
[localCount .. localCount+argCount-1].
|
||||||
|
- Callee returns via RET slot or RET_VOID.
|
||||||
|
- Caller stores return value to dst.
|
||||||
|
|
||||||
|
Other calls:
|
||||||
|
- CALL_VIRTUAL recvSlot, methodId, argBase, argCount, dst
|
||||||
|
- CALL_FALLBACK stmtId, argBase, argCount, dst
|
||||||
|
- CALL_SLOT calleeSlot, argBase, argCount, dst
|
||||||
|
|
||||||
|
## 4) Binary Encoding Layout
|
||||||
|
|
||||||
|
All instructions are:
|
||||||
|
[opcode:U8] [operands...]
|
||||||
|
|
||||||
|
Operand widths:
|
||||||
|
- slotId: S = 1/2/4 bytes (per frame slot width)
|
||||||
|
- constId: K = 2 bytes (U16), extend to 4 if needed
|
||||||
|
- ip: I = 2 bytes (U16) or 4 bytes (U32) per function size
|
||||||
|
- fnId/methodId/stmtId: F/M/T = 2 bytes (U16) unless extended
|
||||||
|
- argCount: C = 2 bytes (U16), extend to 4 if needed
|
||||||
|
|
||||||
|
Endianness: little-endian for multi-byte operands.
|
||||||
|
|
||||||
|
Common operand patterns:
|
||||||
|
- S: one slot
|
||||||
|
- SS: two slots
|
||||||
|
- SSS: three slots
|
||||||
|
- K S: constId + dst slot
|
||||||
|
- S I: slot + jump target
|
||||||
|
- I: jump target
|
||||||
|
- F S C S: fnId, argBase slot, argCount, dst slot
|
||||||
|
|
||||||
|
Arg count flag:
|
||||||
|
- If high bit of C is set (0x8000), the low 15 bits encode a CallArgsPlan constId.
|
||||||
|
- When not set, C is the raw positional count and tailBlockMode=false.
|
||||||
|
|
||||||
|
## 5) Opcode Table
|
||||||
|
|
||||||
|
Note: Any opcode can be compiled to FALLBACK if not implemented in a VM pass.
|
||||||
|
|
||||||
|
### Data movement
|
||||||
|
- NOP
|
||||||
|
- MOVE_OBJ S -> S
|
||||||
|
- MOVE_INT S -> S
|
||||||
|
- MOVE_REAL S -> S
|
||||||
|
- MOVE_BOOL S -> S
|
||||||
|
- BOX_OBJ S -> S
|
||||||
|
- CONST_OBJ K -> S
|
||||||
|
- CONST_INT K -> S
|
||||||
|
- CONST_REAL K -> S
|
||||||
|
- CONST_BOOL K -> S
|
||||||
|
- CONST_NULL -> S
|
||||||
|
|
||||||
|
### Numeric conversions
|
||||||
|
- INT_TO_REAL S -> S
|
||||||
|
- REAL_TO_INT S -> S
|
||||||
|
- BOOL_TO_INT S -> S
|
||||||
|
- INT_TO_BOOL S -> S
|
||||||
|
|
||||||
|
### Arithmetic: INT
|
||||||
|
- ADD_INT S, S -> S
|
||||||
|
- SUB_INT S, S -> S
|
||||||
|
- MUL_INT S, S -> S
|
||||||
|
- DIV_INT S, S -> S
|
||||||
|
- MOD_INT S, S -> S
|
||||||
|
- NEG_INT S -> S
|
||||||
|
- INC_INT S
|
||||||
|
- DEC_INT S
|
||||||
|
|
||||||
|
### Arithmetic: REAL
|
||||||
|
- ADD_REAL S, S -> S
|
||||||
|
- SUB_REAL S, S -> S
|
||||||
|
- MUL_REAL S, S -> S
|
||||||
|
- DIV_REAL S, S -> S
|
||||||
|
- NEG_REAL S -> S
|
||||||
|
|
||||||
|
### Arithmetic: OBJ
|
||||||
|
- ADD_OBJ S, S -> S
|
||||||
|
- SUB_OBJ S, S -> S
|
||||||
|
- MUL_OBJ S, S -> S
|
||||||
|
- DIV_OBJ S, S -> S
|
||||||
|
- MOD_OBJ S, S -> S
|
||||||
|
|
||||||
|
### Bitwise: INT
|
||||||
|
- AND_INT S, S -> S
|
||||||
|
- OR_INT S, S -> S
|
||||||
|
- XOR_INT S, S -> S
|
||||||
|
- SHL_INT S, S -> S
|
||||||
|
- SHR_INT S, S -> S
|
||||||
|
- USHR_INT S, S -> S
|
||||||
|
- INV_INT S -> S
|
||||||
|
|
||||||
|
### Comparisons (typed)
|
||||||
|
- CMP_EQ_INT S, S -> S
|
||||||
|
- CMP_NEQ_INT S, S -> S
|
||||||
|
- CMP_LT_INT S, S -> S
|
||||||
|
- CMP_LTE_INT S, S -> S
|
||||||
|
- CMP_GT_INT S, S -> S
|
||||||
|
- CMP_GTE_INT S, S -> S
|
||||||
|
- CMP_EQ_REAL S, S -> S
|
||||||
|
- CMP_NEQ_REAL S, S -> S
|
||||||
|
- CMP_LT_REAL S, S -> S
|
||||||
|
- CMP_LTE_REAL S, S -> S
|
||||||
|
- CMP_GT_REAL S, S -> S
|
||||||
|
- CMP_GTE_REAL S, S -> S
|
||||||
|
- CMP_EQ_BOOL S, S -> S
|
||||||
|
- CMP_NEQ_BOOL S, S -> S
|
||||||
|
|
||||||
|
### Mixed numeric comparisons
|
||||||
|
- CMP_EQ_INT_REAL S, S -> S
|
||||||
|
- CMP_EQ_REAL_INT S, S -> S
|
||||||
|
- CMP_LT_INT_REAL S, S -> S
|
||||||
|
- CMP_LT_REAL_INT S, S -> S
|
||||||
|
- CMP_LTE_INT_REAL S, S -> S
|
||||||
|
- CMP_LTE_REAL_INT S, S -> S
|
||||||
|
- CMP_GT_INT_REAL S, S -> S
|
||||||
|
- CMP_GT_REAL_INT S, S -> S
|
||||||
|
- CMP_GTE_INT_REAL S, S -> S
|
||||||
|
- CMP_GTE_REAL_INT S, S -> S
|
||||||
|
- CMP_NEQ_INT_REAL S, S -> S
|
||||||
|
- CMP_NEQ_REAL_INT S, S -> S
|
||||||
|
- CMP_EQ_OBJ S, S -> S
|
||||||
|
- CMP_NEQ_OBJ S, S -> S
|
||||||
|
- CMP_REF_EQ_OBJ S, S -> S
|
||||||
|
- CMP_REF_NEQ_OBJ S, S -> S
|
||||||
|
- CMP_LT_OBJ S, S -> S
|
||||||
|
- CMP_LTE_OBJ S, S -> S
|
||||||
|
- CMP_GT_OBJ S, S -> S
|
||||||
|
- CMP_GTE_OBJ S, S -> S
|
||||||
|
|
||||||
|
### Boolean ops
|
||||||
|
- NOT_BOOL S -> S
|
||||||
|
- AND_BOOL S, S -> S
|
||||||
|
- OR_BOOL S, S -> S
|
||||||
|
|
||||||
|
### Control flow
|
||||||
|
- JMP I
|
||||||
|
- JMP_IF_TRUE S, I
|
||||||
|
- JMP_IF_FALSE S, I
|
||||||
|
- RET S
|
||||||
|
- RET_VOID
|
||||||
|
- PUSH_SCOPE K
|
||||||
|
- POP_SCOPE
|
||||||
|
|
||||||
|
### Scope setup
|
||||||
|
- PUSH_SCOPE uses const `SlotPlan` (name -> slot index) to create a child scope and apply slot mapping.
|
||||||
|
- POP_SCOPE restores the parent scope.
|
||||||
|
|
||||||
|
### Calls
|
||||||
|
- CALL_DIRECT F, S, C, S
|
||||||
|
- CALL_VIRTUAL S, M, S, C, S
|
||||||
|
- CALL_FALLBACK T, S, C, S
|
||||||
|
- CALL_SLOT S, S, C, S
|
||||||
|
|
||||||
|
### Object access (optional, later)
|
||||||
|
- GET_FIELD S, M -> S
|
||||||
|
- SET_FIELD S, M, S
|
||||||
|
- GET_INDEX S, S -> S
|
||||||
|
- SET_INDEX S, S, S
|
||||||
|
|
||||||
|
### Fallback
|
||||||
|
- EVAL_FALLBACK T -> S
|
||||||
|
|
||||||
|
## 6) Const Pool Encoding (v0)
|
||||||
|
|
||||||
|
Each const entry is encoded as:
|
||||||
|
[tag:U8] [payload...]
|
||||||
|
|
||||||
|
Tags:
|
||||||
|
- 0x00: NULL
|
||||||
|
- 0x01: BOOL (payload: U8 0/1)
|
||||||
|
- 0x02: INT (payload: S64, little-endian)
|
||||||
|
- 0x03: REAL (payload: F64, IEEE-754, little-endian)
|
||||||
|
- 0x04: STRING (payload: U32 length + UTF-8 bytes)
|
||||||
|
- 0x05: OBJ_REF (payload: U32 index into external Obj table)
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- OBJ_REF is reserved for embedding prebuilt Obj handles if needed.
|
||||||
|
- Strings use UTF-8; length is bytes, not chars.
|
||||||
|
|
||||||
|
## 7) Function Header (binary container)
|
||||||
|
|
||||||
|
Suggested layout for a bytecode function blob:
|
||||||
|
- magic: U32 ("LYBC")
|
||||||
|
- version: U16 (0x0001)
|
||||||
|
- slotWidth: U8 (1,2,4)
|
||||||
|
- ipWidth: U8 (2,4)
|
||||||
|
- constIdWidth: U8 (2,4)
|
||||||
|
- localCount: U32
|
||||||
|
- codeSize: U32 (bytes)
|
||||||
|
- constCount: U32
|
||||||
|
- constPool: [const entries...]
|
||||||
|
- code: [bytecode...]
|
||||||
|
|
||||||
|
Const pool entries use the encoding described in section 6.
|
||||||
|
|
||||||
|
## 8) Sample Bytecode (illustrative)
|
||||||
|
|
||||||
|
Example Lyng:
|
||||||
|
val x = 2
|
||||||
|
val y = 3
|
||||||
|
val z = x + y
|
||||||
|
|
||||||
|
Assume:
|
||||||
|
- localCount = 3 (x,y,z)
|
||||||
|
- argCount = 0
|
||||||
|
- slot width = 1 byte
|
||||||
|
- const pool: [INT 2, INT 3]
|
||||||
|
|
||||||
|
Bytecode:
|
||||||
|
CONST_INT k0 -> s0
|
||||||
|
CONST_INT k1 -> s1
|
||||||
|
ADD_INT s0, s1 -> s2
|
||||||
|
RET_VOID
|
||||||
|
|
||||||
|
Encoded (opcode values symbolic):
|
||||||
|
[OP_CONST_INT][k0][s0]
|
||||||
|
[OP_CONST_INT][k1][s1]
|
||||||
|
[OP_ADD_INT][s0][s1][s2]
|
||||||
|
[OP_RET_VOID]
|
||||||
|
|
||||||
|
## 9) Notes
|
||||||
|
|
||||||
|
- Mixed-mode is allowed: compiler can emit FALLBACK ops for unsupported nodes.
|
||||||
|
- The VM must be suspendable; on suspension, store ip + minimal operand state.
|
||||||
|
- Source mapping uses a separate ip->Pos table, not part of core bytecode.
|
||||||
+74
-11
@@ -113,6 +113,48 @@ val handler = object {
|
|||||||
- **Serialization**: Anonymous objects are **not serializable**. Attempting to encode an anonymous object via `Lynon` will throw a `SerializationException`. This is because their class definition is transient and cannot be safely restored in a different session or process.
|
- **Serialization**: Anonymous objects are **not serializable**. Attempting to encode an anonymous object via `Lynon` will throw a `SerializationException`. This is because their class definition is transient and cannot be safely restored in a different session or process.
|
||||||
- **Type Identity**: Every object expression creates a unique anonymous class. Two identical object expressions will result in two different classes with distinct type identities.
|
- **Type Identity**: Every object expression creates a unique anonymous class. Two identical object expressions will result in two different classes with distinct type identities.
|
||||||
|
|
||||||
|
## Nested Declarations
|
||||||
|
|
||||||
|
Lyng allows classes, objects, enums, and type aliases to be declared inside another class. These declarations live in the **class namespace** (not the instance), so they do not capture an outer instance and are accessed with a qualifier.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
type Alias = B
|
||||||
|
enum E { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
```
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- **Qualified access**: use `Outer.Inner` for nested classes/objects/enums/aliases. Inside `Outer` you can refer to them by unqualified name unless shadowed.
|
||||||
|
- **No inner semantics**: nested declarations do not capture an instance of the outer class. They are resolved at compile time.
|
||||||
|
- **Visibility**: `private` restricts a nested declaration to the declaring class body (not visible from outside or subclasses).
|
||||||
|
- **Reflection name**: a nested class reports `Outer.Inner` (e.g., `A.B::class.name` is `"A.B"`).
|
||||||
|
- **Type aliases**: behave as aliases of the qualified nested type and are expanded by the type system.
|
||||||
|
|
||||||
|
### Lifted Enum Entries
|
||||||
|
|
||||||
|
Enums can optionally lift their entries into the surrounding class namespace using `*`:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
assertEquals(A.Two, A.E.Two)
|
||||||
|
```
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- `E*` exposes entries in `A` as if they were direct members (`A.One`).
|
||||||
|
- If a name would conflict with an existing class member, compilation fails (no implicit fallback).
|
||||||
|
- Without `*`, use the normal `A.E.One` form.
|
||||||
|
|
||||||
## Properties
|
## Properties
|
||||||
|
|
||||||
Properties allow you to define member accessors that look like fields but execute code when read or written. Unlike regular fields, properties in Lyng do **not** have automatic backing fields; they are pure accessors.
|
Properties allow you to define member accessors that look like fields but execute code when read or written. Unlike regular fields, properties in Lyng do **not** have automatic backing fields; they are pure accessors.
|
||||||
@@ -425,7 +467,7 @@ Key rules and features:
|
|||||||
|
|
||||||
- Visibility
|
- Visibility
|
||||||
- `private`: accessible only inside the declaring class body; not visible in subclasses and cannot be accessed via `this@Type` or casts.
|
- `private`: accessible only inside the declaring class body; not visible in subclasses and cannot be accessed via `this@Type` or casts.
|
||||||
- `protected`: accessible in the declaring class and in any of its transitive subclasses (including MI), but not from unrelated contexts; qualification/casts do not bypass it.
|
- `protected`: accessible in the declaring class and in any of its transitive subclasses (including MI). Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Protected members are not visible from unrelated contexts; qualification/casts do not bypass it.
|
||||||
|
|
||||||
## Abstract Classes and Members
|
## Abstract Classes and Members
|
||||||
|
|
||||||
@@ -857,23 +899,44 @@ Private fields are visible only _inside the class instance_:
|
|||||||
void
|
void
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
### Transient fields
|
||||||
|
|
||||||
|
You can mark a field or a constructor parameter as transient using the `@Transient` attribute. Transient members are ignored during serialization (Lynon and JSON) and are also excluded from structural equality (`==`) checks.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class Session(@Transient val token, val userId) {
|
||||||
|
@Transient var lastAccess = time.now()
|
||||||
|
var data = Map()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
For more details on how transient fields behave during restoration, see the [Serialization Guide](serialization.md).
|
||||||
|
|
||||||
### Protected members
|
### Protected members
|
||||||
|
|
||||||
Protected members are available to the declaring class and all of its transitive subclasses (including via MI), but not from unrelated contexts:
|
Protected members are available to the declaring class and all of its transitive subclasses (including via MI). Additionally, an ancestor class can access a `protected` member of its descendant if the ancestor also defines or inherits a member with the same name (i.e., it is an override of something the ancestor knows about).
|
||||||
|
|
||||||
```
|
Protected members are not available from unrelated contexts:
|
||||||
class A() {
|
|
||||||
protected fun ping() { "pong" }
|
```lyng
|
||||||
}
|
class Base {
|
||||||
class B() : A() {
|
abstract protected fun foo()
|
||||||
fun call() { this@A.ping() }
|
|
||||||
|
fun bar() {
|
||||||
|
// Ancestor can see foo() because it's an override
|
||||||
|
// of a member it defines (even as abstract):
|
||||||
|
foo()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val b = B()
|
class Derived : Base {
|
||||||
assertEquals("pong", b.call())
|
override protected fun foo() { "ok" }
|
||||||
|
}
|
||||||
|
|
||||||
|
assertEquals("ok", Derived().bar())
|
||||||
|
|
||||||
// Unrelated access is forbidden, even via cast
|
// Unrelated access is forbidden, even via cast
|
||||||
assertThrows { (b as A).ping() }
|
assertThrows { (Derived() as Base).foo() }
|
||||||
```
|
```
|
||||||
|
|
||||||
It is possible to provide private constructor parameters so they can be
|
It is possible to provide private constructor parameters so they can be
|
||||||
|
|||||||
+30
-7
@@ -45,10 +45,11 @@ are equal or within another, taking into account the end-inclusiveness:
|
|||||||
assert( (1..<3) in (1..3) )
|
assert( (1..<3) in (1..3) )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
## Finite Ranges are iterable
|
## Ranges are iterable
|
||||||
|
|
||||||
So given a range with both ends, you can assume it is [Iterable]. This automatically let
|
Finite ranges are [Iterable] and can be used in loops and list conversions.
|
||||||
use finite ranges in loops and convert it to lists:
|
Open-ended ranges are iterable only with an explicit `step`, and open-start
|
||||||
|
ranges are never iterable.
|
||||||
|
|
||||||
assert( [-2, -1, 0, 1] == (-2..1).toList() )
|
assert( [-2, -1, 0, 1] == (-2..1).toList() )
|
||||||
>>> void
|
>>> void
|
||||||
@@ -70,6 +71,26 @@ but
|
|||||||
>>> 2
|
>>> 2
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
### Stepped ranges
|
||||||
|
|
||||||
|
Use `step` to change the iteration increment. The range bounds still define membership,
|
||||||
|
so iteration ends when the next value is no longer in the range.
|
||||||
|
|
||||||
|
assert( [1,3,5] == (1..5 step 2).toList() )
|
||||||
|
assert( [1,3] == (1..<5 step 2).toList() )
|
||||||
|
assert( ['a','c','e'] == ('a'..'e' step 2).toList() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Real ranges require an explicit step:
|
||||||
|
|
||||||
|
assert( [0,0.25,0.5,0.75,1.0] == (0.0..1.0 step 0.25).toList() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Open-ended ranges require an explicit step to iterate:
|
||||||
|
|
||||||
|
(0.. step 1).take(3).toList()
|
||||||
|
>>> [0,1,2]
|
||||||
|
|
||||||
## Character ranges
|
## Character ranges
|
||||||
|
|
||||||
You can use Char as both ends of the closed range:
|
You can use Char as both ends of the closed range:
|
||||||
@@ -98,10 +119,12 @@ Exclusive end char ranges are supported too:
|
|||||||
| isEndInclusive | true for '..' | Bool |
|
| isEndInclusive | true for '..' | Bool |
|
||||||
| isOpen | at any end | Bool |
|
| isOpen | at any end | Bool |
|
||||||
| isIntRange | both start and end are Int | Bool |
|
| isIntRange | both start and end are Int | Bool |
|
||||||
| start | | Bool |
|
| step | explicit iteration step | Any? |
|
||||||
| end | | Bool |
|
| start | | Any? |
|
||||||
|
| end | | Any? |
|
||||||
| size | for finite ranges, see above | Long |
|
| size | for finite ranges, see above | Long |
|
||||||
| [] | see above | |
|
| [] | see above | |
|
||||||
| | | |
|
|
||||||
|
|
||||||
[Iterable]: Iterable.md
|
Ranges are also used with the `clamp(value, range)` function and the `value.clamp(range)` extension method to limit values within boundaries.
|
||||||
|
|
||||||
|
[Iterable]: Iterable.md
|
||||||
@@ -19,6 +19,7 @@ you can use it's class to ensure type:
|
|||||||
|-----------------|-------------------------------------------------------------|------|
|
|-----------------|-------------------------------------------------------------|------|
|
||||||
| `.roundToInt()` | round to nearest int like round(x) | Int |
|
| `.roundToInt()` | round to nearest int like round(x) | Int |
|
||||||
| `.toInt()` | convert integer part of real to `Int` dropping decimal part | Int |
|
| `.toInt()` | convert integer part of real to `Int` dropping decimal part | Int |
|
||||||
|
| `.clamp(range)` | clamp value within range boundaries | Real |
|
||||||
| | | |
|
| | | |
|
||||||
| | | |
|
| | | |
|
||||||
| | | |
|
| | | |
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# AI notes: avoid Kotlin/Wasm invalid IR with suspend lambdas
|
||||||
|
|
||||||
|
## Do
|
||||||
|
- Prefer explicit `object : Statement()` with `override suspend fun execute(...)` when building compiler statements.
|
||||||
|
- Keep `Statement` objects non-lambda, especially in compiler hot paths like parsing/var declarations.
|
||||||
|
- If you need conditional behavior, return early in `execute` instead of wrapping `parseExpression()` with `statement(...) { ... }`.
|
||||||
|
- When wasmJs tests hang in the browser, first check `wasmJsNodeTest` for a compile error; hangs often mean module instantiation failed.
|
||||||
|
|
||||||
|
## Don't
|
||||||
|
- Do not create suspend lambdas inside `Statement` factories (`statement { ... }`) for wasm targets.
|
||||||
|
- Do not "fix" hangs by increasing browser timeouts; it masks invalid wasm generation.
|
||||||
|
|
||||||
|
## Debugging tips
|
||||||
|
- Look for `$invokeCOROUTINE$` in wasm function names when mapping failures.
|
||||||
|
- If node test logs a wasm compile error, the browser hang is likely the same root cause.
|
||||||
@@ -0,0 +1,128 @@
|
|||||||
|
# Generics and type expressions
|
||||||
|
|
||||||
|
This document covers generics, bounds, unions/intersections, and the rules for type expressions in Lyng.
|
||||||
|
|
||||||
|
# Generic parameters
|
||||||
|
|
||||||
|
Declare type parameters with `<...>` on functions and classes:
|
||||||
|
|
||||||
|
fun id<T>(x: T): T = x
|
||||||
|
class Box<T>(val value: T)
|
||||||
|
|
||||||
|
Type arguments are usually inferred at call sites:
|
||||||
|
|
||||||
|
val b = Box(10) // Box<Int>
|
||||||
|
val s = id("ok") // T is String
|
||||||
|
|
||||||
|
# Bounds
|
||||||
|
|
||||||
|
Use `:` to set bounds. Bounds may be unions (`|`) or intersections (`&`):
|
||||||
|
|
||||||
|
fun sum<T: Int | Real>(x: T, y: T) = x + y
|
||||||
|
class Named<T: Iterable & Comparable>(val data: T)
|
||||||
|
|
||||||
|
Bounds are checked at compile time. For union bounds, the argument must fit at least one option. For intersection bounds, it must fit all options.
|
||||||
|
|
||||||
|
# Variance
|
||||||
|
|
||||||
|
Generic types are invariant by default. You can specify declaration-site variance:
|
||||||
|
|
||||||
|
class Source<out T>(val value: T)
|
||||||
|
class Sink<in T> { fun accept(x: T) { ... } }
|
||||||
|
|
||||||
|
`out` makes the type covariant (produced), `in` makes it contravariant (consumed).
|
||||||
|
|
||||||
|
# Type aliases
|
||||||
|
|
||||||
|
Type aliases name type expressions (including unions/intersections):
|
||||||
|
|
||||||
|
type Num = Int | Real
|
||||||
|
type AB = A & B
|
||||||
|
|
||||||
|
Aliases can be generic and can use bounds and defaults:
|
||||||
|
|
||||||
|
type Maybe<T> = T?
|
||||||
|
type IntList<T: Int> = List<T>
|
||||||
|
|
||||||
|
Aliases expand to their underlying type expressions. They can be used anywhere a type expression is expected.
|
||||||
|
|
||||||
|
# Inference rules
|
||||||
|
|
||||||
|
- Literals set obvious types (`1` is `Int`, `1.0` is `Real`, etc.).
|
||||||
|
- Empty list literals default to `List<Object>` unless constrained by context.
|
||||||
|
- Non-empty list literals infer element type as a union of element types.
|
||||||
|
- Map literals infer key and value types; named keys are `String`.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
val a = [1, 2, 3] // List<Int>
|
||||||
|
val b = [1, "two", true] // List<Int | String | Bool>
|
||||||
|
val c: List<Int> = [] // List<Int>
|
||||||
|
|
||||||
|
val m1 = { "a": 1, "b": 2 } // Map<String, Int>
|
||||||
|
val m2 = { "a": 1, "b": "x" } // Map<String, Int | String>
|
||||||
|
val m3 = { ...m1, "c": true } // Map<String, Int | Bool>
|
||||||
|
|
||||||
|
Map spreads carry key/value types when possible.
|
||||||
|
|
||||||
|
Spreads propagate element type when possible:
|
||||||
|
|
||||||
|
val base = [1, 2]
|
||||||
|
val mix = [...base, 3] // List<Int>
|
||||||
|
|
||||||
|
# Type expressions
|
||||||
|
|
||||||
|
Type expressions include simple types, generics, unions, and intersections:
|
||||||
|
|
||||||
|
Int
|
||||||
|
List<String>
|
||||||
|
Int | String
|
||||||
|
Iterable & Comparable
|
||||||
|
|
||||||
|
These type expressions can appear in casts and `is` checks.
|
||||||
|
|
||||||
|
# `is`, `in`, and `==` with type expressions
|
||||||
|
|
||||||
|
There are two categories of `is` checks:
|
||||||
|
|
||||||
|
1) Value checks: `x is T`
|
||||||
|
- `x` is a value, `T` is a type expression.
|
||||||
|
- This is a runtime instance check.
|
||||||
|
|
||||||
|
2) Type checks: `T1 is T2`
|
||||||
|
- both sides are type expressions (class objects or unions/intersections).
|
||||||
|
- This is a *type-subset* check: every value of `T1` must fit in `T2`.
|
||||||
|
|
||||||
|
Exact type expression equality uses `==` and is structural (union/intersection order does not matter).
|
||||||
|
|
||||||
|
Includes checks use `in` with type expressions:
|
||||||
|
|
||||||
|
A in T
|
||||||
|
|
||||||
|
This means `A` is a subset of `T` (the same relation as `A is T`).
|
||||||
|
|
||||||
|
Examples (T = A | B):
|
||||||
|
|
||||||
|
T == A // false
|
||||||
|
T is A // false
|
||||||
|
A in T // true
|
||||||
|
B in T // true
|
||||||
|
T is A | B // true
|
||||||
|
|
||||||
|
# Practical examples
|
||||||
|
|
||||||
|
fun acceptInts<T: Int>(xs: List<T>) { }
|
||||||
|
acceptInts([1, 2, 3])
|
||||||
|
// acceptInts([1, "a"]) -> compile-time error
|
||||||
|
|
||||||
|
fun f<T>(list: List<T>) {
|
||||||
|
assert( T is Int | String | Bool )
|
||||||
|
assert( !(T is Int) )
|
||||||
|
assert( Int in T )
|
||||||
|
}
|
||||||
|
f([1, "two", true])
|
||||||
|
|
||||||
|
# Notes
|
||||||
|
|
||||||
|
- `T` is reified as a type expression when needed (e.g., union/intersection). When it is a single class, `T` is that class object.
|
||||||
|
- Type expression checks are compile-time where possible; runtime checks only happen for `is` on values and explicit casts.
|
||||||
@@ -20,7 +20,18 @@ Simple classes serialization is supported:
|
|||||||
assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
|
assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Note that mutable members are serialized:
|
Note that mutable members are serialized by default. You can exclude any member (including constructor parameters) from JSON serialization using the `@Transient` attribute:
|
||||||
|
|
||||||
|
import lyng.serialization
|
||||||
|
|
||||||
|
class Point2(@Transient val foo, val bar) {
|
||||||
|
@Transient var reason = 42
|
||||||
|
var visible = 100
|
||||||
|
}
|
||||||
|
assertEquals( "{\"bar\":2,\"visible\":100}", Point2(1,2).toJsonString() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Note that if you override json serialization:
|
||||||
|
|
||||||
import lyng.serialization
|
import lyng.serialization
|
||||||
|
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ or transformed `Real` otherwise.
|
|||||||
| pow(x, y) | ${x^y}$ |
|
| pow(x, y) | ${x^y}$ |
|
||||||
| sqrt(x) | $ \sqrt {x}$ |
|
| sqrt(x) | $ \sqrt {x}$ |
|
||||||
| abs(x) | absolute value of x. Int if x is Int, Real otherwise |
|
| abs(x) | absolute value of x. Int if x is Int, Real otherwise |
|
||||||
|
| clamp(x, range) | limit x to be inside range boundaries |
|
||||||
|
|
||||||
For example:
|
For example:
|
||||||
|
|
||||||
@@ -102,6 +103,11 @@ For example:
|
|||||||
// abs() keeps the argument type:
|
// abs() keeps the argument type:
|
||||||
assert( abs(-1) is Int)
|
assert( abs(-1) is Int)
|
||||||
assert( abs(-2.21) == 2.21 )
|
assert( abs(-2.21) == 2.21 )
|
||||||
|
|
||||||
|
// clamp() limits value to the range:
|
||||||
|
assert( clamp(15, 0..10) == 10 )
|
||||||
|
assert( clamp(-5, 0..10) == 0 )
|
||||||
|
assert( 5.clamp(0..10) == 5 )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
## Scientific constant
|
## Scientific constant
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#!/bin/env lyng
|
#!/bin/env lyng
|
||||||
|
|
||||||
import lyng.io.fs
|
import lyng.io.fs
|
||||||
import lyng.stdlib
|
|
||||||
|
|
||||||
val files = Path("../..").list().toList()
|
val files = Path("../..").list().toList()
|
||||||
// most long is longest?
|
// most long is longest?
|
||||||
|
|||||||
@@ -4,15 +4,21 @@
|
|||||||
test the Lyng way. It is not meant to be effective.
|
test the Lyng way. It is not meant to be effective.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
fun naiveCountHappyNumbers() {
|
fun naiveCountHappyNumbers(): Int {
|
||||||
var count = 0
|
var count = 0
|
||||||
for( n1 in 0..9 )
|
for( n1 in 0..9 ) {
|
||||||
for( n2 in 0..9 )
|
for( n2 in 0..9 ) {
|
||||||
for( n3 in 0..9 )
|
for( n3 in 0..9 ) {
|
||||||
for( n4 in 0..9 )
|
for( n4 in 0..9 ) {
|
||||||
for( n5 in 0..9 )
|
for( n5 in 0..9 ) {
|
||||||
for( n6 in 0..9 )
|
for( n6 in 0..9 ) {
|
||||||
if( n1 + n2 + n3 == n4 + n5 + n6 ) count++
|
if( n1 + n2 + n3 == n4 + n5 + n6 ) count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
count
|
count
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,4 +34,3 @@ for( r in 1..900 ) {
|
|||||||
assert( found == 55252 )
|
assert( found == 55252 )
|
||||||
delay(0.05)
|
delay(0.05)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
# Scopes and Closures: resolution and safety
|
# Scopes and Closures: resolution and safety
|
||||||
|
|
||||||
|
Attention to AI: name lookup is ibsolete and must not be used with bytecode compiler
|
||||||
|
|
||||||
This page documents how name resolution works with `ClosureScope`, how to avoid recursion pitfalls, and how to safely capture and execute callbacks that need access to outer locals.
|
This page documents how name resolution works with `ClosureScope`, how to avoid recursion pitfalls, and how to safely capture and execute callbacks that need access to outer locals.
|
||||||
|
|
||||||
## Why this matters
|
## Why this matters
|
||||||
|
|||||||
+25
-8
@@ -20,20 +20,37 @@ It is as simple as:
|
|||||||
assert( text.length > encodedBits.toBuffer().size )
|
assert( text.length > encodedBits.toBuffer().size )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Any class you create is serializable by default; lynon serializes first constructor fields, then any `var` member fields:
|
Any class you create is serializable by default; lynon serializes first constructor fields, then any `var` member fields.
|
||||||
|
|
||||||
import lyng.serialization
|
## Transient Fields
|
||||||
|
|
||||||
class Point(x,y)
|
Sometimes you have fields that should not be serialized, for example, temporary caches, secret data, or derived values that are recomputed in `init` blocks. You can mark such fields with the `@Transient` attribute:
|
||||||
|
|
||||||
val p = Lynon.decode( Lynon.encode( Point(5,6) ) )
|
```lyng
|
||||||
|
class MyData(@Transient val tempSecret, val publicData) {
|
||||||
|
@Transient var cachedValue = 0
|
||||||
|
var persistentValue = 42
|
||||||
|
|
||||||
assertEquals( 5, p.x )
|
init {
|
||||||
assertEquals( 6, p.y )
|
// cachedValue can be recomputed here upon deserialization
|
||||||
>>> void
|
cachedValue = computeCache(publicData)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Transient fields:
|
||||||
|
- Are **omitted** from Lynon binary streams.
|
||||||
|
- Are **omitted** from JSON output (via `toJson`).
|
||||||
|
- Are **ignored** during structural equality checks (`==`).
|
||||||
|
- If a transient constructor parameter has a **default value**, it will be restored to that default value during deserialization. Otherwise, it will be `null`.
|
||||||
|
- Class body fields marked as `@Transient` will keep their initial values (or values assigned in `init`) after deserialization.
|
||||||
|
|
||||||
just as expected.
|
## Serialization of Objects and Classes
|
||||||
|
|
||||||
|
- **Singleton Objects**: `object` declarations are serializable by name. Their state (mutable fields) is also serialized and restored, respecting `@Transient`.
|
||||||
|
- **Classes**: Class objects themselves can be serialized. They are serialized by their full qualified name. When converted to JSON, a class object includes its public static fields (excluding those marked `@Transient`).
|
||||||
|
|
||||||
|
## Custom Serialization
|
||||||
|
|
||||||
Important is to understand that normally `Lynon.decode` wants [BitBuffer], as `Lynon.encode` produces. If you have the regular [Buffer], be sure to convert it:
|
Important is to understand that normally `Lynon.decode` wants [BitBuffer], as `Lynon.encode` produces. If you have the regular [Buffer], be sure to convert it:
|
||||||
|
|
||||||
|
|||||||
+75
-136
@@ -2,166 +2,105 @@
|
|||||||
|
|
||||||
Lyng date and time support requires importing `lyng.time` packages. Lyng uses simple yet modern time object models:
|
Lyng date and time support requires importing `lyng.time` packages. Lyng uses simple yet modern time object models:
|
||||||
|
|
||||||
- `Instant` class for time stamps with platform-dependent resolution
|
- `Instant` class for absolute time stamps with platform-dependent resolution.
|
||||||
- `Duration` to represent amount of time not depending on the calendar, e.g. in absolute units (milliseconds, seconds,
|
- `DateTime` class for calendar-aware points in time within a specific time zone.
|
||||||
hours, days)
|
- `Duration` to represent amount of time not depending on the calendar (e.g., milliseconds, seconds).
|
||||||
|
|
||||||
## Time instant: `Instant`
|
## Time instant: `Instant`
|
||||||
|
|
||||||
Represent some moment of time not depending on the calendar (calendar for example may b e changed, daylight saving time
|
Represent some moment of time not depending on the calendar. It is similar to `TIMESTAMP` in SQL or `Instant` in Kotlin.
|
||||||
can be for example introduced or dropped). It is similar to `TIMESTAMP` in SQL or `Instant` in Kotlin. Some moment of
|
|
||||||
time; not the calendar date.
|
|
||||||
|
|
||||||
Instant is comparable to other Instant. Subtracting instants produce `Duration`, period in time that is not dependent on
|
### Constructing and converting
|
||||||
the calendar, e.g. absolute time period.
|
|
||||||
|
|
||||||
It is possible to add or subtract `Duration` to and from `Instant`, that gives another `Instant`.
|
|
||||||
|
|
||||||
Instants are converted to and from `Real` number of seconds before or after Unix Epoch, 01.01.1970. Constructor with
|
|
||||||
single number parameter constructs from such number of seconds,
|
|
||||||
and any instance provide `.epochSeconds` member:
|
|
||||||
|
|
||||||
import lyng.time
|
import lyng.time
|
||||||
|
|
||||||
// default constructor returns time now:
|
// default constructor returns time now:
|
||||||
val t1 = Instant()
|
val t1 = Instant()
|
||||||
val t2 = Instant()
|
|
||||||
assert( t2 - t1 < 1.millisecond )
|
|
||||||
assert( t2.epochSeconds - t1.epochSeconds < 0.001 )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## Constructing
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
|
|
||||||
// empty constructor gives current time instant using system clock:
|
|
||||||
val now = Instant()
|
|
||||||
|
|
||||||
// constructor with Instant instance makes a copy:
|
|
||||||
assertEquals( now, Instant(now) )
|
|
||||||
|
|
||||||
// constructing from a number is trated as seconds since unix epoch:
|
|
||||||
val copyOfNow = Instant( now.epochSeconds )
|
|
||||||
|
|
||||||
// note that instant resolution is higher that Real can hold
|
|
||||||
// so reconstructed from real slightly differs:
|
|
||||||
assert( abs( (copyOfNow - now).milliseconds ) < 0.01 )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
The resolution of system clock could be more precise and double precision real number of `Real`, keep it in mind.
|
|
||||||
|
|
||||||
## Comparing and calculating periods
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
|
|
||||||
val now = Instant()
|
// constructing from a number is treated as seconds since unix epoch:
|
||||||
|
val t2 = Instant(1704110400) // 2024-01-01T12:00:00Z
|
||||||
|
|
||||||
// you cam add or subtract periods, and compare
|
// from RFC3339 string:
|
||||||
assert( now - 5.minutes < now )
|
val t3 = Instant("2024-01-01T12:00:00.123456Z")
|
||||||
val oneHourAgo = now - 1.hour
|
|
||||||
assertEquals( now, oneHourAgo + 1.hour)
|
// truncation:
|
||||||
|
val t4 = t3.truncateToMinute
|
||||||
|
assertEquals(t4.toRFC3339(), "2024-01-01T12:00:00Z")
|
||||||
|
|
||||||
|
// to localized DateTime (uses system default TZ if not specified):
|
||||||
|
val dt = t3.toDateTime("+02:00")
|
||||||
|
assertEquals(dt.hour, 14)
|
||||||
|
|
||||||
>>> void
|
### Instant members
|
||||||
|
|
||||||
## Getting the max precision
|
|
||||||
|
|
||||||
Normally, subtracting instants gives precision to microseconds, which is well inside the jitter
|
|
||||||
the language VM adds. Still `Instant()` or `Instant.now()` capture most precise system timer at hand and provide inner
|
|
||||||
value of 12 bytes, up to nanoseconds (hopefully). To access it use:
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
|
|
||||||
// capture time
|
|
||||||
val now = Instant.now()
|
|
||||||
|
|
||||||
// this is Int value, number of whole epoch
|
|
||||||
// milliseconds to the moment, it fits 8 bytes Int well
|
|
||||||
val seconds = now.epochWholeSeconds
|
|
||||||
assert(seconds is Int)
|
|
||||||
|
|
||||||
// and this is Int value of nanoseconds _since_ the epochMillis,
|
|
||||||
// it effectively add 4 more mytes int:
|
|
||||||
val nanos = now.nanosecondsOfSecond
|
|
||||||
assert(nanos is Int)
|
|
||||||
assert( nanos in 0..999_999_999 )
|
|
||||||
|
|
||||||
// we can construct epochSeconds from these parts:
|
|
||||||
assertEquals( now.epochSeconds, nanos * 1e-9 + seconds )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## Truncating to more realistic precision
|
|
||||||
|
|
||||||
Full precision Instant is way too long and impractical to store, especially when serializing,
|
|
||||||
so it is possible to truncate it to milliseconds, microseconds or seconds:
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
import lyng.serialization
|
|
||||||
|
|
||||||
// max supported size (now microseconds for serialized value):
|
|
||||||
// note that encoding return _bit array_ and this is a _bit size_:
|
|
||||||
val s0 = Lynon.encode(Instant.now()).size
|
|
||||||
|
|
||||||
// shorter: milliseconds only
|
|
||||||
val s1 = Lynon.encode(Instant.now().truncateToMillisecond()).size
|
|
||||||
|
|
||||||
// truncated to seconds, good for file mtime, etc:
|
|
||||||
val s2 = Lynon.encode(Instant.now().truncateToSecond()).size
|
|
||||||
assert( s1 < s0 )
|
|
||||||
assert( s2 < s1 )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## Formatting instants
|
|
||||||
|
|
||||||
You can freely use `Instant` in string formatting. It supports usual sprintf-style formats:
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
val now = Instant()
|
|
||||||
|
|
||||||
// will be something like "now: 12:10:05"
|
|
||||||
val currentTimeOnly24 = "now: %tT"(now)
|
|
||||||
|
|
||||||
// we can extract epoch second with formatting too,
|
|
||||||
// this was since early C time
|
|
||||||
|
|
||||||
// get epoch while seconds from formatting
|
|
||||||
val unixEpoch = "Now is %ts since unix epoch"(now)
|
|
||||||
|
|
||||||
// and it is the same as now.epochSeconds, int part:
|
|
||||||
assertEquals( unixEpoch, "Now is %d since unix epoch"(now.epochSeconds.toInt()) )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
See
|
|
||||||
the [complete list of available formats](https://github.com/sergeych/mp_stools?tab=readme-ov-file#datetime-formatting)
|
|
||||||
and the [formatting reference](https://github.com/sergeych/mp_stools?tab=readme-ov-file#printf--sprintf): it all works
|
|
||||||
in Lyng as `"format"(args...)`!
|
|
||||||
|
|
||||||
## Instant members
|
|
||||||
|
|
||||||
| member | description |
|
| member | description |
|
||||||
|--------------------------------|---------------------------------------------------------|
|
|--------------------------------|---------------------------------------------------------|
|
||||||
| epochSeconds: Real | positive or negative offset in seconds since Unix epoch |
|
| epochSeconds: Real | positive or negative offset in seconds since Unix epoch |
|
||||||
| epochWholeSeconds: Int | same, but in _whole seconds_. Slightly faster |
|
| epochWholeSeconds: Int | same, but in _whole seconds_. Slightly faster |
|
||||||
| nanosecondsOfSecond: Int | offset from epochWholeSeconds in nanos (1) |
|
| nanosecondsOfSecond: Int | offset from epochWholeSeconds in nanos |
|
||||||
| isDistantFuture: Bool | true if it `Instant.distantFuture` |
|
| isDistantFuture: Bool | true if it `Instant.distantFuture` |
|
||||||
| isDistantPast: Bool | true if it `Instant.distantPast` |
|
| isDistantPast: Bool | true if it `Instant.distantPast` |
|
||||||
| truncateToSecond: Intant | create new instnce truncated to second |
|
| truncateToMinute: Instant | create new instance truncated to minute |
|
||||||
| truncateToMillisecond: Instant | truncate new instance with to millisecond |
|
| truncateToSecond: Instant | create new instance truncated to second |
|
||||||
|
| truncateToMillisecond: Instant | truncate new instance to millisecond |
|
||||||
| truncateToMicrosecond: Instant | truncate new instance to microsecond |
|
| truncateToMicrosecond: Instant | truncate new instance to microsecond |
|
||||||
|
| toRFC3339(): String | format as RFC3339 string (UTC) |
|
||||||
|
| toDateTime(tz?): DateTime | localize to a TimeZone (ID string or offset seconds) |
|
||||||
|
|
||||||
(1)
|
## Calendar time: `DateTime`
|
||||||
: The value of nanoseconds is to be added to `epochWholeSeconds` to get exact time point. It is in 0..999_999_999 range.
|
|
||||||
The precise time instant value therefore needs as for now 12 bytes integer; we might use bigint later (it is planned to
|
|
||||||
be added)
|
|
||||||
|
|
||||||
## Class members
|
`DateTime` represents a point in time in a specific timezone. It provides access to calendar components like year,
|
||||||
|
month, and day.
|
||||||
|
|
||||||
| member | description |
|
### Constructing
|
||||||
|--------------------------------|----------------------------------------------|
|
|
||||||
| Instant.now() | create new instance with current system time |
|
|
||||||
| Instant.distantPast: Instant | most distant instant in past |
|
|
||||||
| Instant.distantFuture: Instant | most distant instant in future |
|
|
||||||
|
|
||||||
# `Duraion` class
|
import lyng.time
|
||||||
|
|
||||||
|
// Current time in system default timezone
|
||||||
|
val now = DateTime.now()
|
||||||
|
|
||||||
|
// Specific timezone
|
||||||
|
val offsetTime = DateTime.now("+02:00")
|
||||||
|
|
||||||
|
// From Instant
|
||||||
|
val dt = Instant().toDateTime("Z")
|
||||||
|
|
||||||
|
// By components (year, month, day, hour=0, minute=0, second=0, timeZone="UTC")
|
||||||
|
val dt2 = DateTime(2024, 1, 1, 12, 0, 0, "Z")
|
||||||
|
|
||||||
|
// From RFC3339 string
|
||||||
|
val dt3 = DateTime.parseRFC3339("2024-01-01T12:00:00+02:00")
|
||||||
|
|
||||||
|
### DateTime members
|
||||||
|
|
||||||
|
| member | description |
|
||||||
|
|----------------------------------|-----------------------------------------------|
|
||||||
|
| year: Int | year component |
|
||||||
|
| month: Int | month component (1..12) |
|
||||||
|
| day: Int | day of month (alias `dayOfMonth`) |
|
||||||
|
| hour: Int | hour component (0..23) |
|
||||||
|
| minute: Int | minute component (0..59) |
|
||||||
|
| second: Int | second component (0..59) |
|
||||||
|
| dayOfWeek: Int | day of week (1=Monday, 7=Sunday) |
|
||||||
|
| timeZone: String | timezone ID string |
|
||||||
|
| toInstant(): Instant | convert back to absolute Instant |
|
||||||
|
| toUTC(): DateTime | shortcut to convert to UTC |
|
||||||
|
| toTimeZone(tz): DateTime | convert to another timezone |
|
||||||
|
| addMonths(n): DateTime | add/subtract months (normalizes end of month) |
|
||||||
|
| addYears(n): DateTime | add/subtract years |
|
||||||
|
| toRFC3339(): String | format with timezone offset |
|
||||||
|
| static now(tz?): DateTime | create DateTime with current time |
|
||||||
|
| static parseRFC3339(s): DateTime | parse RFC3339 string |
|
||||||
|
|
||||||
|
### Arithmetic and normalization
|
||||||
|
|
||||||
|
`DateTime` handles calendar arithmetic correctly:
|
||||||
|
|
||||||
|
val leapDay = Instant("2024-02-29T12:00:00Z").toDateTime("Z")
|
||||||
|
val nextYear = leapDay.addYears(1)
|
||||||
|
assertEquals(nextYear.day, 28) // Feb 29, 2024 -> Feb 28, 2025
|
||||||
|
|
||||||
|
# `Duration` class
|
||||||
|
|
||||||
Represent absolute time distance between two `Instant`.
|
Represent absolute time distance between two `Instant`.
|
||||||
|
|
||||||
|
|||||||
+169
-5
@@ -10,6 +10,7 @@ __Other documents to read__ maybe after this one:
|
|||||||
- [OOP notes](OOP.md), [exception handling](exceptions_handling.md)
|
- [OOP notes](OOP.md), [exception handling](exceptions_handling.md)
|
||||||
- [math in Lyng](math.md), [the `when` statement](when.md), [return statement](return_statement.md)
|
- [math in Lyng](math.md), [the `when` statement](when.md), [return statement](return_statement.md)
|
||||||
- [Testing and Assertions](Testing.md)
|
- [Testing and Assertions](Testing.md)
|
||||||
|
- [Generics and type expressions](generics.md)
|
||||||
- [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
|
||||||
@@ -106,6 +107,23 @@ Singleton objects are declared using the `object` keyword. They define a class a
|
|||||||
|
|
||||||
Logger.log("Hello singleton!")
|
Logger.log("Hello singleton!")
|
||||||
|
|
||||||
|
## Nested Declarations (short)
|
||||||
|
|
||||||
|
Classes, objects, and enums can be declared inside another class. They live in the class namespace (no outer instance capture), so you access them with a qualifier:
|
||||||
|
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
|
||||||
|
See [OOP notes](OOP.md#nested-declarations) for rules, visibility, and enum lifting details.
|
||||||
|
|
||||||
## Delegation (briefly)
|
## Delegation (briefly)
|
||||||
|
|
||||||
You can delegate properties and functions to other objects using the `by` keyword. This is perfect for patterns like `lazy` initialization.
|
You can delegate properties and functions to other objects using the `by` keyword. This is perfect for patterns like `lazy` initialization.
|
||||||
@@ -224,6 +242,9 @@ This also prevents chain assignments so use parentheses:
|
|||||||
|
|
||||||
## Nullability
|
## Nullability
|
||||||
|
|
||||||
|
Nullability is part of the type. `String` is non-null, `String?` is nullable. Use `!!` to assert non-null and throw
|
||||||
|
`NullReferenceException` if the value is `null`.
|
||||||
|
|
||||||
When the value is `null`, it might throws `NullReferenceException`, the name is somewhat a tradition. To avoid it
|
When the value is `null`, it might throws `NullReferenceException`, the name is somewhat a tradition. To avoid it
|
||||||
one can check it against null or use _null coalescing_. The null coalescing means, if the operand (left) is null,
|
one can check it against null or use _null coalescing_. The null coalescing means, if the operand (left) is null,
|
||||||
the operation won't be performed and the result will be null. Here is the difference:
|
the operation won't be performed and the result will be null. Here is the difference:
|
||||||
@@ -242,6 +263,9 @@ the operation won't be performed and the result will be null. Here is the differ
|
|||||||
assert( ref?() == null )
|
assert( ref?() == null )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
Note: `?.` is still a typed operation. The receiver must have a compile-time type that declares the member; if the
|
||||||
|
receiver is `Object`, cast it first or declare a more specific type.
|
||||||
|
|
||||||
There is also "elvis operator", null-coalesce infix operator '?:' that returns rvalue if lvalue is `null`:
|
There is also "elvis operator", null-coalesce infix operator '?:' that returns rvalue if lvalue is `null`:
|
||||||
|
|
||||||
null ?: "nothing"
|
null ?: "nothing"
|
||||||
@@ -425,8 +449,6 @@ Almost the same, using `val`:
|
|||||||
val foo = 1
|
val foo = 1
|
||||||
foo += 1 // this will throw exception
|
foo += 1 // this will throw exception
|
||||||
|
|
||||||
# Constants
|
|
||||||
|
|
||||||
Same as in kotlin:
|
Same as in kotlin:
|
||||||
|
|
||||||
val HalfPi = π / 2
|
val HalfPi = π / 2
|
||||||
@@ -434,6 +456,144 @@ Same as in kotlin:
|
|||||||
Note using greek characters in identifiers! All letters allowed, but remember who might try to read your script, most
|
Note using greek characters in identifiers! All letters allowed, but remember who might try to read your script, most
|
||||||
likely will know some English, the rest is the pure uncertainty.
|
likely will know some English, the rest is the pure uncertainty.
|
||||||
|
|
||||||
|
# Types and inference
|
||||||
|
|
||||||
|
Lyng uses Kotlin-style static types with inference. You can always write explicit types, but in most places the compiler
|
||||||
|
can infer them from literals, defaults, and flow analysis.
|
||||||
|
|
||||||
|
## Type annotations
|
||||||
|
|
||||||
|
Use `:` to specify a type:
|
||||||
|
|
||||||
|
var x: Int = 10
|
||||||
|
val label: String = "count"
|
||||||
|
fun clamp(x: Int, min: Int, max: Int): Int { ... }
|
||||||
|
|
||||||
|
`Object` is the top type. If you omit a type and there is no default value, the parameter is `Object` by default:
|
||||||
|
|
||||||
|
fun show(x) { println(x) } // x is Object
|
||||||
|
|
||||||
|
For nullable types, add `?`:
|
||||||
|
|
||||||
|
fun showMaybe(x: Object?) { ... }
|
||||||
|
fun parseInt(s: String?): Int? { ... }
|
||||||
|
|
||||||
|
There is also a nullable shorthand for untyped parameters and constructor args: `x?` means `x: Object?`.
|
||||||
|
It cannot be combined with an explicit type annotation.
|
||||||
|
|
||||||
|
class A(x?) { ... } // x: Object?
|
||||||
|
fun f(x?) { x == null } // x: Object?
|
||||||
|
|
||||||
|
Type aliases name type expressions and can be generic:
|
||||||
|
|
||||||
|
type Num = Int | Real
|
||||||
|
type Maybe<T> = T?
|
||||||
|
|
||||||
|
Aliases expand to their underlying type expressions. See `docs/generics.md` for details.
|
||||||
|
|
||||||
|
`void` is a singleton value of the class `Void`. `Void` can be used as an explicit return type:
|
||||||
|
|
||||||
|
fun log(msg): Void { println(msg); void }
|
||||||
|
|
||||||
|
`Null` is the class of `null`. It is a singleton type and mostly useful for type inference results.
|
||||||
|
|
||||||
|
## Type inference
|
||||||
|
|
||||||
|
The compiler infers types from:
|
||||||
|
|
||||||
|
- literals: `1` is `Int`, `1.0` is `Real`, `"s"` is `String`, `'c'` is `Char`
|
||||||
|
- defaults: `fun f(x=1, name="n")` infers `x: Int`, `name: String`
|
||||||
|
- assignments: `val x = call()` uses the return type of `call`
|
||||||
|
- returns and branches: the result type of a block is the last expression, and if any branch is nullable,
|
||||||
|
the inferred type becomes nullable
|
||||||
|
- numeric ops: `Int` and `Real` stay `Int` when both sides are `Int`, and promote to `Real` on mixed arithmetic
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
fun inc(x=0) = x + 1 // (Int)->Int
|
||||||
|
fun maybe(flag) { if(flag) 1 else null } // ()->Int?
|
||||||
|
|
||||||
|
Untyped locals are allowed, but their type is fixed on the first assignment:
|
||||||
|
|
||||||
|
var x
|
||||||
|
x = 1 // x becomes Int
|
||||||
|
x = "one" // compile-time error
|
||||||
|
|
||||||
|
var y = null // y is Object?
|
||||||
|
val z = null // z is Null
|
||||||
|
|
||||||
|
Empty list/map literals default to `List<Object>` and `Map<Object,Object>` until a more specific type is known:
|
||||||
|
|
||||||
|
val xs = [] // List<Object>
|
||||||
|
val ys: List<Int> = [] // List<Int>
|
||||||
|
|
||||||
|
Map literals infer key/value types from entries; named keys are `String`. See `docs/generics.md` for details.
|
||||||
|
|
||||||
|
## Flow analysis
|
||||||
|
|
||||||
|
Lyng uses flow analysis to narrow types inside branches:
|
||||||
|
|
||||||
|
fun len(x: String?): Int {
|
||||||
|
if( x == null ) return 0
|
||||||
|
// x is String (non-null) in this branch
|
||||||
|
return x.length
|
||||||
|
}
|
||||||
|
|
||||||
|
`is` checks and `when` branches also narrow types:
|
||||||
|
|
||||||
|
fun kind(x: Object) {
|
||||||
|
if( x is Int ) return "int"
|
||||||
|
if( x is String ) return "string"
|
||||||
|
return "other"
|
||||||
|
}
|
||||||
|
|
||||||
|
Narrowing is local to the branch; after the branch, the original type is restored.
|
||||||
|
|
||||||
|
## Casts and unknown types
|
||||||
|
|
||||||
|
Use `as` for explicit casts. The compiler inserts casts only when it can be valid and necessary. If a cast fails at
|
||||||
|
runtime, it throws `ClassCastException`. If the value is nullable, `as T` implies a non-null assertion.
|
||||||
|
|
||||||
|
Member access is resolved at compile time. Only members of `Object` are available on unknown types; non-Object members
|
||||||
|
require an explicit cast:
|
||||||
|
|
||||||
|
fun f(x) { // x is Object
|
||||||
|
x.toString() // ok (Object member)
|
||||||
|
x.size() // compile-time error
|
||||||
|
(x as List).size() // ok
|
||||||
|
}
|
||||||
|
|
||||||
|
This avoids runtime name-resolution fallbacks; all symbols must be known at compile time.
|
||||||
|
|
||||||
|
## Generics and bounds
|
||||||
|
|
||||||
|
Generic parameters are declared with `<...>`:
|
||||||
|
|
||||||
|
fun id<T>(x: T): T = x
|
||||||
|
class Box<T>(val value: T)
|
||||||
|
|
||||||
|
Bounds use `:` and can combine with `&` (intersection) and `|` (union):
|
||||||
|
|
||||||
|
fun sum<T: Int | Real>(x: T, y: T) = x + y
|
||||||
|
class Named<T: Iterable & Comparable>(val data: T)
|
||||||
|
|
||||||
|
Type arguments are usually inferred from call sites:
|
||||||
|
|
||||||
|
val b = Box(10) // Box<Int>
|
||||||
|
val s = id("ok") // T is String
|
||||||
|
|
||||||
|
See [Generics and type expressions](generics.md) for bounds, unions/intersections, and type-checking rules.
|
||||||
|
|
||||||
|
## Variance
|
||||||
|
|
||||||
|
Generic types are invariant by default, so `List<Int>` is not a `List<Object>`.
|
||||||
|
Use declaration-site variance when you need it:
|
||||||
|
|
||||||
|
class Source<out T>(val value: T)
|
||||||
|
class Sink<in T> { fun accept(x: T) { ... } }
|
||||||
|
|
||||||
|
`out` makes the type covariant (only produced), `in` makes it contravariant (only consumed).
|
||||||
|
|
||||||
# Defining functions
|
# Defining functions
|
||||||
|
|
||||||
fun check(amount) {
|
fun check(amount) {
|
||||||
@@ -1330,7 +1490,7 @@ than enum arrays, until `Lynon.encodeTyped` will be implemented.
|
|||||||
var result = null // here we will store the result
|
var result = null // here we will store the result
|
||||||
>>> null
|
>>> null
|
||||||
|
|
||||||
# Integral data types
|
# Built-in types
|
||||||
|
|
||||||
| type | description | literal samples |
|
| type | description | literal samples |
|
||||||
|--------|---------------------------------|---------------------|
|
|--------|---------------------------------|---------------------|
|
||||||
@@ -1340,6 +1500,7 @@ than enum arrays, until `Lynon.encodeTyped` will be implemented.
|
|||||||
| Char | single unicode character | `'S'`, `'\n'` |
|
| Char | single unicode character | `'S'`, `'\n'` |
|
||||||
| String | unicode string, no limits | "hello" (see below) |
|
| String | unicode string, no limits | "hello" (see below) |
|
||||||
| List | mutable list | [1, "two", 3] |
|
| List | mutable list | [1, "two", 3] |
|
||||||
|
| Object | top type for all values | |
|
||||||
| Void | no value could exist, singleton | void |
|
| Void | no value could exist, singleton | void |
|
||||||
| Null | missing value, singleton | null |
|
| Null | missing value, singleton | null |
|
||||||
| Fn | callable type | |
|
| Fn | callable type | |
|
||||||
@@ -1484,6 +1645,9 @@ A typical set of String functions includes:
|
|||||||
| lower(), lowercase() | change case to unicode upper |
|
| lower(), lowercase() | change case to unicode upper |
|
||||||
| upper(), uppercase() | change case to unicode lower |
|
| upper(), uppercase() | change case to unicode lower |
|
||||||
| trim() | trim space chars from both ends |
|
| trim() | trim space chars from both ends |
|
||||||
|
| isEmpty() | true if string is empty |
|
||||||
|
| isNotEmpty() | true if string is not empty |
|
||||||
|
| isBlank() | true if empty or contains only whitespace |
|
||||||
| startsWith(prefix) | true if starts with a prefix |
|
| startsWith(prefix) | true if starts with a prefix |
|
||||||
| endsWith(prefix) | true if ends with a prefix |
|
| endsWith(prefix) | true if ends with a prefix |
|
||||||
| last() | get last character of a string or throw |
|
| last() | get last character of a string or throw |
|
||||||
@@ -1701,7 +1865,7 @@ assertEquals(null, (buzz as? Foo)?.runA())
|
|||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
- Resolution order uses C3 MRO (active): deterministic, monotonic order suitable for diamonds and complex hierarchies. Example: for `class D() : B(), C()` where both `B()` and `C()` derive from `A()`, the C3 order is `D → B → C → A`. The first visible match wins.
|
- Resolution order uses C3 MRO (active): deterministic, monotonic order suitable for diamonds and complex hierarchies. Example: for `class D() : B(), C()` where both `B()` and `C()` derive from `A()`, the C3 order is `D → B → C → A`. The first visible match wins.
|
||||||
- `private` is visible only inside the declaring class; `protected` is visible from the declaring class and any of its transitive subclasses. Qualialsofication (`this@Type`) or casts do not bypass visibility.
|
- `private` is visible only inside the declaring class; `protected` is visible from the declaring class and its subclasses. Additionally, ancestors can access protected members of descendants if they override a member known to the ancestor. Qualification (`this@Type`) or casts do not bypass visibility.
|
||||||
- Safe‑call `?.` works with `as?` for optional dispatch.
|
- Safe‑call `?.` works with `as?` for optional dispatch.
|
||||||
|
|
||||||
## Extension members
|
## Extension members
|
||||||
@@ -1728,4 +1892,4 @@ Example with custom accessors:
|
|||||||
|
|
||||||
Extension members are **scope-isolated**: they are visible only in the scope where they are defined and its children. This prevents name collisions and improves security.
|
Extension members are **scope-isolated**: they are visible only in the scope where they are defined and its children. This prevents name collisions and improves security.
|
||||||
|
|
||||||
To get details on OOP in Lyng, see [OOP notes](OOP.md).
|
To get details on OOP in Lyng, see [OOP notes](OOP.md).
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# Wasm generation hang in wasmJs browser tests
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
The wasmJs browser test runner hung after commit 5f819dc. The root cause was invalid WebAssembly generated by the Kotlin/Wasm backend when certain compiler paths emitted suspend lambdas for `Statement` execution. The invalid module failed to instantiate in the browser, and Karma kept the browser connected but never ran tests.
|
||||||
|
|
||||||
|
## Symptoms
|
||||||
|
- `:lynglib:wasmJsBrowserTest` hangs indefinitely in ChromeHeadless.
|
||||||
|
- `:lynglib:wasmJsNodeTest` fails with a WebAssembly compile error similar to:
|
||||||
|
- `struct.set expected type (ref null XXXX), found global.get of type (ref null YYYY)`
|
||||||
|
- The failing function name in the wasm name section looks like:
|
||||||
|
- `net.sergeych.lyng.$invokeCOROUTINE$.doResume`
|
||||||
|
|
||||||
|
## Root cause
|
||||||
|
The delegation/var-declaration changes introduced compiler-generated suspend lambdas inside `Statement` construction (e.g., `statement { ... }` wrappers). Kotlin/Wasm generates extra coroutine state for those suspend lambdas, which in this case produced invalid wasm IR (mismatched GC reference types). The browser loader then waits forever because the module fails to instantiate.
|
||||||
|
|
||||||
|
## Fix
|
||||||
|
Avoid suspend-lambda `Statement` construction in compiler code paths. Replace `statement { ... }` and other anonymous suspend lambdas with explicit `object : Statement()` implementations and move logic into `override suspend fun execute(...)`. This keeps the resulting wasm IR valid while preserving behavior.
|
||||||
|
|
||||||
|
## Where it was fixed
|
||||||
|
- `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt`
|
||||||
|
- `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt`
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
- `./gradlew :lynglib:wasmJsNodeTest --info`
|
||||||
|
- `./gradlew :lynglib:wasmJsBrowserTest --info`
|
||||||
|
|
||||||
|
Both tests finish quickly after the change.
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
# What's New in Lyng
|
# What's New in Lyng
|
||||||
|
|
||||||
This document highlights the latest additions and improvements to the Lyng language and its ecosystem.
|
This document highlights the latest additions and improvements to the Lyng language and its ecosystem.
|
||||||
|
For a programmer-focused migration summary, see `docs/whats_new_1_3.md`.
|
||||||
|
|
||||||
## Language Features
|
## Language Features
|
||||||
|
|
||||||
@@ -24,6 +25,9 @@ class Person(private var _age: Int) {
|
|||||||
### Private and Protected Setters
|
### Private and Protected Setters
|
||||||
You can now restrict the visibility of a property's or field's setter using `private set` or `protected set`. This allows members to be publicly readable but only writable from within the declaring class or its subclasses.
|
You can now restrict the visibility of a property's or field's setter using `private set` or `protected set`. This allows members to be publicly readable but only writable from within the declaring class or its subclasses.
|
||||||
|
|
||||||
|
### Refined Protected Visibility
|
||||||
|
Ancestor classes can now access `protected` members of their descendants if it is an override of a member known to the ancestor. This enables base classes to call protected methods that are implemented or overridden in subclasses.
|
||||||
|
|
||||||
```lyng
|
```lyng
|
||||||
class Counter {
|
class Counter {
|
||||||
var count = 0
|
var count = 0
|
||||||
@@ -105,6 +109,24 @@ object Config {
|
|||||||
Config.show()
|
Config.show()
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Nested Declarations and Lifted Enums
|
||||||
|
You can now declare classes, objects, enums, and type aliases inside another class. These nested declarations live in the class namespace (no outer instance capture) and are accessed with a qualifier.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
```
|
||||||
|
|
||||||
|
The `*` on `enum E*` lifts entries into the enclosing class namespace (compile-time error on ambiguity).
|
||||||
|
|
||||||
### Object Expressions
|
### Object Expressions
|
||||||
You can now create anonymous objects that inherit from classes or interfaces using the `object : Base { ... }` syntax. These expressions capture their lexical scope and support multiple inheritance.
|
You can now create anonymous objects that inherit from classes or interfaces using the `object : Base { ... }` syntax. These expressions capture their lexical scope and support multiple inheritance.
|
||||||
|
|
||||||
@@ -168,6 +190,41 @@ settings["theme"] ?= "dark"
|
|||||||
|
|
||||||
The operator returns the final value of the receiver (the original value if it was not `null`, or the new value if the assignment occurred).
|
The operator returns the final value of the receiver (the original value if it was not `null`, or the new value if the assignment occurred).
|
||||||
|
|
||||||
|
### Transient Attribute (`@Transient`)
|
||||||
|
The `@Transient` attribute can now be applied to class fields, constructor parameters, and static fields to exclude them from serialization.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class MyData(@Transient val tempSecret, val publicData) {
|
||||||
|
@Transient var cachedValue = 0
|
||||||
|
var persistentValue = 42
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Key features:
|
||||||
|
- **Serialization**: Transient members are omitted from both Lynon binary streams and JSON output.
|
||||||
|
- **Structural Equality**: Transient fields are automatically ignored during `==` equality checks.
|
||||||
|
- **Deserialization**: Transient constructor parameters with default values are correctly restored to those defaults upon restoration.
|
||||||
|
|
||||||
|
### Value Clamping (`clamp`)
|
||||||
|
A new `clamp()` function has been added to the standard library to limit a value within a specified range. It is available as both a global function and an extension method on all objects.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
// Global function
|
||||||
|
clamp(15, 0..10) // returns 10
|
||||||
|
clamp(-5, 0..10) // returns 0
|
||||||
|
|
||||||
|
// Extension method
|
||||||
|
val x = 15
|
||||||
|
x.clamp(0..10) // returns 10
|
||||||
|
|
||||||
|
// Exclusive and open-ended ranges
|
||||||
|
15.clamp(0..<10) // returns 9
|
||||||
|
15.clamp(..10) // returns 10
|
||||||
|
-5.clamp(0..) // returns 0
|
||||||
|
```
|
||||||
|
|
||||||
|
`clamp()` correctly handles inclusive (`..`) and exclusive (`..<`) ranges. For discrete types like `Int` and `Char`, clamping to an exclusive upper bound returns the previous value.
|
||||||
|
|
||||||
## Tooling and Infrastructure
|
## Tooling and Infrastructure
|
||||||
|
|
||||||
### CLI: Formatting Command
|
### CLI: Formatting Command
|
||||||
|
|||||||
@@ -0,0 +1,133 @@
|
|||||||
|
# What's New in Lyng 1.3 (vs 1.2.* / master)
|
||||||
|
|
||||||
|
This is a programmer-focused summary of what changed since the 1.2.* line on `master`. It highlights new language and type-system features, runtime/IDE improvements, and how to migrate code safely.
|
||||||
|
|
||||||
|
## Highlights
|
||||||
|
|
||||||
|
- Generics are now a first-class part of the type system, with bounds, variance, unions, and intersections.
|
||||||
|
- Type aliases and type-expression checks (`T1 is T2`, `A in T`) enable richer static modeling.
|
||||||
|
- Nested declarations inside classes, plus lifted enum entries via `enum E*`.
|
||||||
|
- Stepped ranges (`step`) including iterable open-ended and real ranges.
|
||||||
|
- Runtime and compiler speedups: more bytecode coverage, direct slot access, call-site caching.
|
||||||
|
|
||||||
|
## Language and type system
|
||||||
|
|
||||||
|
### Generics, bounds, and variance
|
||||||
|
|
||||||
|
You can declare generic functions/classes with `<...>`, restrict them with bounds, and control variance.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun id<T>(x: T): T = x
|
||||||
|
class Box<out T>(val value: T)
|
||||||
|
|
||||||
|
fun sum<T: Int | Real>(x: T, y: T) = x + y
|
||||||
|
class Named<T: Iterable & Comparable>(val data: T)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Type aliases and type expressions
|
||||||
|
|
||||||
|
Type aliases can name any type expression, including unions and intersections.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
type Num = Int | Real
|
||||||
|
type Maybe<T> = T?
|
||||||
|
```
|
||||||
|
|
||||||
|
Type expressions can be checked directly:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun f<T>(xs: List<T>) {
|
||||||
|
assert( T is Int | String | Bool ) // type-subset check
|
||||||
|
assert( Int in T ) // same relation as `Int is T`
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Value checks remain `x is T`. Type expression equality uses `==` and is structural.
|
||||||
|
|
||||||
|
### Nullable shorthand for parameters
|
||||||
|
|
||||||
|
Untyped parameters and constructor args can use `x?` as shorthand for `x: Object?`:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A(x?) { ... }
|
||||||
|
fun f(x?) { x == null }
|
||||||
|
```
|
||||||
|
|
||||||
|
### List/map literal inference
|
||||||
|
|
||||||
|
The compiler now infers element and key/value types from literals and spreads. Mixed element types produce unions.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
val a = [1, 2, 3] // List<Int>
|
||||||
|
val b = [1, "two", true] // List<Int | String | Bool>
|
||||||
|
val m = { "a": 1, "b": "x" } // Map<String, Int | String>
|
||||||
|
```
|
||||||
|
|
||||||
|
### Compile-time member access only
|
||||||
|
|
||||||
|
Member access is resolved at compile time. On unknown types, only `Object` members are visible; other members require an explicit cast.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun f(x) { // x: Object
|
||||||
|
x.toString() // ok
|
||||||
|
x.size() // compile-time error
|
||||||
|
(x as List).size()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
This removes runtime name-resolution fallbacks and makes errors deterministic.
|
||||||
|
|
||||||
|
### Nested declarations and lifted enums
|
||||||
|
|
||||||
|
Classes, objects, enums, and type aliases can be declared inside another class and accessed by qualifier. Enums can lift entries into the outer namespace with `*`.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
type Alias = B
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val b = A.B()
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Stepped ranges
|
||||||
|
|
||||||
|
Ranges now support `step`, and open-ended/real ranges are iterable only with an explicit step.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
(1..5 step 2).toList() // [1,3,5]
|
||||||
|
(0.0..1.0 step 0.25).toList() // [0,0.25,0.5,0.75,1.0]
|
||||||
|
(0.. step 1).take(3).toList() // [0,1,2]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tooling and performance
|
||||||
|
|
||||||
|
- Bytecode compiler/VM coverage expanded (loops, expressions, calls), improving execution speed and consistency.
|
||||||
|
- Direct frame-slot access and scoped slot addressing reduce lookup overhead, including in closures.
|
||||||
|
- Call-site caching and numeric fast paths reduce hot-loop overhead.
|
||||||
|
- IDE tooling updated for the new type system and nested declarations; MiniAst-based completion work continues.
|
||||||
|
|
||||||
|
## Migration guide (from 1.2.*)
|
||||||
|
|
||||||
|
1) Replace dynamic member access on unknown types
|
||||||
|
- If you relied on runtime name resolution, add explicit casts or annotate types so the compiler can resolve members.
|
||||||
|
|
||||||
|
2) Adopt new type-system constructs where helpful
|
||||||
|
- Consider `type` aliases for complex unions/intersections.
|
||||||
|
- Prefer generic signatures over `Object` when the API is parametric.
|
||||||
|
|
||||||
|
3) Update range iteration where needed
|
||||||
|
- Use `step` for open-ended or real ranges you want to iterate.
|
||||||
|
|
||||||
|
4) Nullable shorthand is optional
|
||||||
|
- If you used untyped nullable params, you can keep `x` (Object) or switch to `x?` (Object?) for clarity.
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
- `docs/generics.md`
|
||||||
|
- `docs/Range.md`
|
||||||
|
- `docs/OOP.md`
|
||||||
|
- `docs/BytecodeSpec.md`
|
||||||
+2
-2
@@ -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.
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
#Gradle
|
#Gradle
|
||||||
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
#Kotlin
|
#Kotlin
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ kotlin = "2.3.0"
|
|||||||
android-minSdk = "24"
|
android-minSdk = "24"
|
||||||
android-compileSdk = "34"
|
android-compileSdk = "34"
|
||||||
kotlinx-coroutines = "1.10.2"
|
kotlinx-coroutines = "1.10.2"
|
||||||
|
kotlinx-datetime = "0.6.1"
|
||||||
mp_bintools = "0.3.2"
|
mp_bintools = "0.3.2"
|
||||||
firebaseCrashlyticsBuildtools = "3.0.3"
|
firebaseCrashlyticsBuildtools = "3.0.3"
|
||||||
okioVersion = "3.10.2"
|
okioVersion = "3.10.2"
|
||||||
@@ -16,6 +17,7 @@ clikt-markdown = { module = "com.github.ajalt.clikt:clikt-markdown", version.ref
|
|||||||
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" }
|
||||||
|
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
|
||||||
mp_bintools = { module = "net.sergeych:mp_bintools", version.ref = "mp_bintools" }
|
mp_bintools = { module = "net.sergeych:mp_bintools", version.ref = "mp_bintools" }
|
||||||
firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
|
firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
|
||||||
okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }
|
okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }
|
||||||
|
|||||||
+41
-251
@@ -25,15 +25,13 @@ import com.intellij.openapi.progress.ProgressManager
|
|||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.binding.Binder
|
|
||||||
import net.sergeych.lyng.binding.SymbolKind
|
|
||||||
import net.sergeych.lyng.highlight.HighlightKind
|
import net.sergeych.lyng.highlight.HighlightKind
|
||||||
import net.sergeych.lyng.highlight.SimpleLyngHighlighter
|
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
|
import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
|
||||||
import net.sergeych.lyng.idea.util.LyngAstManager
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.tools.LyngDiagnosticSeverity
|
||||||
|
import net.sergeych.lyng.tools.LyngLanguageTools
|
||||||
|
import net.sergeych.lyng.tools.LyngSemanticKind
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ExternalAnnotator that runs Lyng MiniAst on the document text in background
|
* ExternalAnnotator that runs Lyng MiniAst on the document text in background
|
||||||
@@ -43,8 +41,8 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?, val file: PsiFile)
|
data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?, val file: PsiFile)
|
||||||
|
|
||||||
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
||||||
data class Error(val start: Int, val end: Int, val message: String)
|
data class Diag(val start: Int, val end: Int, val message: String, val severity: HighlightSeverity)
|
||||||
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null)
|
data class Result(val modStamp: Long, val spans: List<Span>, val diagnostics: List<Diag> = emptyList())
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
override fun collectInformation(file: PsiFile): Input? {
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
val doc: Document = file.viewProvider.document ?: return null
|
||||||
@@ -59,224 +57,46 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
if (collectedInfo == null) return null
|
if (collectedInfo == null) return null
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
val text = collectedInfo.text
|
val text = collectedInfo.text
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
val analysis = LyngAstManager.getAnalysis(collectedInfo.file)
|
||||||
|
|
||||||
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
|
||||||
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
|
||||||
?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
|
?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
|
||||||
|
val mini = analysis.mini
|
||||||
ProgressManager.checkCanceled()
|
|
||||||
val source = Source(collectedInfo.file.name, text)
|
|
||||||
|
|
||||||
val out = ArrayList<Span>(256)
|
|
||||||
|
|
||||||
fun isFollowedByParenOrBlock(rangeEnd: Int): Boolean {
|
ProgressManager.checkCanceled()
|
||||||
var i = rangeEnd
|
|
||||||
while (i < text.length) {
|
val out = ArrayList<Span>(256)
|
||||||
val ch = text[i]
|
val diags = ArrayList<Diag>()
|
||||||
if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n') { i++; continue }
|
|
||||||
return ch == '(' || ch == '{'
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
fun putRange(start: Int, end: Int, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
fun putRange(start: Int, end: Int, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
||||||
if (start in 0..end && end <= text.length && start < end) out += Span(start, end, key)
|
if (start in 0..end && end <= text.length && start < end) out += Span(start, end, key)
|
||||||
}
|
}
|
||||||
fun putName(startPos: net.sergeych.lyng.Pos, name: String, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
|
||||||
val s = source.offsetOf(startPos)
|
fun keyForKind(kind: LyngSemanticKind): com.intellij.openapi.editor.colors.TextAttributesKey? = when (kind) {
|
||||||
putRange(s, (s + name.length).coerceAtMost(text.length), key)
|
LyngSemanticKind.Function -> LyngHighlighterColors.FUNCTION
|
||||||
}
|
LyngSemanticKind.Class, LyngSemanticKind.Enum, LyngSemanticKind.TypeAlias -> LyngHighlighterColors.TYPE
|
||||||
fun putMiniRange(r: MiniRange, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
LyngSemanticKind.Value -> LyngHighlighterColors.VALUE
|
||||||
val s = source.offsetOf(r.start)
|
LyngSemanticKind.Variable -> LyngHighlighterColors.VARIABLE
|
||||||
val e = source.offsetOf(r.end)
|
LyngSemanticKind.Parameter -> LyngHighlighterColors.PARAMETER
|
||||||
putRange(s, e, key)
|
LyngSemanticKind.TypeRef -> LyngHighlighterColors.TYPE
|
||||||
|
LyngSemanticKind.EnumConstant -> LyngHighlighterColors.ENUM_CONSTANT
|
||||||
}
|
}
|
||||||
|
|
||||||
// Declarations
|
// Semantic highlights from shared tooling
|
||||||
mini.declarations.forEach { d ->
|
LyngLanguageTools.semanticHighlights(analysis).forEach { span ->
|
||||||
if (d.nameStart.source != source) return@forEach
|
keyForKind(span.kind)?.let { putRange(span.range.start, span.range.endExclusive, it) }
|
||||||
when (d) {
|
|
||||||
is MiniFunDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.FUNCTION_DECLARATION)
|
|
||||||
is MiniClassDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
|
|
||||||
is MiniValDecl -> putName(
|
|
||||||
d.nameStart,
|
|
||||||
d.name,
|
|
||||||
if (d.mutable) LyngHighlighterColors.VARIABLE else LyngHighlighterColors.VALUE
|
|
||||||
)
|
|
||||||
is MiniEnumDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Imports: each segment as namespace/path
|
// Imports: each segment as namespace/path
|
||||||
mini.imports.forEach { imp ->
|
mini?.imports?.forEach { imp ->
|
||||||
if (imp.range.start.source != source) return@forEach
|
imp.segments.forEach { seg ->
|
||||||
imp.segments.forEach { seg -> putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE) }
|
val start = analysis.source.offsetOf(seg.range.start)
|
||||||
}
|
val end = analysis.source.offsetOf(seg.range.end)
|
||||||
|
putRange(start, end, LyngHighlighterColors.NAMESPACE)
|
||||||
// Parameters
|
|
||||||
fun addParams(params: List<MiniParam>) {
|
|
||||||
params.forEach { p ->
|
|
||||||
if (p.nameStart.source == source)
|
|
||||||
putName(p.nameStart, p.name, LyngHighlighterColors.PARAMETER)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mini.declarations.forEach { d ->
|
|
||||||
when (d) {
|
|
||||||
is MiniFunDecl -> addParams(d.params)
|
|
||||||
is MiniClassDecl -> d.members.filterIsInstance<MiniMemberFunDecl>().forEach { addParams(it.params) }
|
|
||||||
else -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Type name segments (including generics base & args)
|
|
||||||
fun addTypeSegments(t: MiniTypeRef?) {
|
|
||||||
when (t) {
|
|
||||||
is MiniTypeName -> t.segments.forEach { seg ->
|
|
||||||
if (seg.range.start.source != source) return@forEach
|
|
||||||
val s = source.offsetOf(seg.range.start)
|
|
||||||
putRange(s, (s + seg.name.length).coerceAtMost(text.length), LyngHighlighterColors.TYPE)
|
|
||||||
}
|
|
||||||
is MiniGenericType -> {
|
|
||||||
addTypeSegments(t.base)
|
|
||||||
t.args.forEach { addTypeSegments(it) }
|
|
||||||
}
|
|
||||||
is MiniFunctionType -> {
|
|
||||||
t.receiver?.let { addTypeSegments(it) }
|
|
||||||
t.params.forEach { addTypeSegments(it) }
|
|
||||||
addTypeSegments(t.returnType)
|
|
||||||
}
|
|
||||||
is MiniTypeVar -> { /* name is in range; could be highlighted as TYPE as well */
|
|
||||||
if (t.range.start.source == source)
|
|
||||||
putMiniRange(t.range, LyngHighlighterColors.TYPE)
|
|
||||||
}
|
|
||||||
null -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
fun addDeclTypeSegments(d: MiniDecl) {
|
|
||||||
if (d.nameStart.source != source) return
|
|
||||||
when (d) {
|
|
||||||
is MiniFunDecl -> {
|
|
||||||
addTypeSegments(d.returnType)
|
|
||||||
d.params.forEach { addTypeSegments(it.type) }
|
|
||||||
addTypeSegments(d.receiver)
|
|
||||||
}
|
|
||||||
is MiniValDecl -> {
|
|
||||||
addTypeSegments(d.type)
|
|
||||||
addTypeSegments(d.receiver)
|
|
||||||
}
|
|
||||||
is MiniClassDecl -> {
|
|
||||||
d.ctorFields.forEach { addTypeSegments(it.type) }
|
|
||||||
d.classFields.forEach { addTypeSegments(it.type) }
|
|
||||||
for (m in d.members) {
|
|
||||||
when (m) {
|
|
||||||
is MiniMemberFunDecl -> {
|
|
||||||
addTypeSegments(m.returnType)
|
|
||||||
m.params.forEach { addTypeSegments(it.type) }
|
|
||||||
}
|
|
||||||
is MiniMemberValDecl -> {
|
|
||||||
addTypeSegments(m.type)
|
|
||||||
}
|
|
||||||
else -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
is MiniEnumDecl -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
mini.declarations.forEach { d -> addDeclTypeSegments(d) }
|
|
||||||
|
|
||||||
ProgressManager.checkCanceled()
|
|
||||||
|
|
||||||
// Semantic usages via Binder (best-effort)
|
|
||||||
try {
|
|
||||||
val binding = Binder.bind(text, mini)
|
|
||||||
|
|
||||||
// Map declaration ranges to avoid duplicating them as usages
|
|
||||||
val declKeys = HashSet<Pair<Int, Int>>(binding.symbols.size * 2)
|
|
||||||
binding.symbols.forEach { sym -> declKeys += (sym.declStart to sym.declEnd) }
|
|
||||||
|
|
||||||
fun keyForKind(k: SymbolKind) = when (k) {
|
|
||||||
SymbolKind.Function -> LyngHighlighterColors.FUNCTION
|
|
||||||
SymbolKind.Class, SymbolKind.Enum -> LyngHighlighterColors.TYPE
|
|
||||||
SymbolKind.Parameter -> LyngHighlighterColors.PARAMETER
|
|
||||||
SymbolKind.Value -> LyngHighlighterColors.VALUE
|
|
||||||
SymbolKind.Variable -> LyngHighlighterColors.VARIABLE
|
|
||||||
}
|
|
||||||
|
|
||||||
// Track covered ranges to not override later heuristics
|
|
||||||
val covered = HashSet<Pair<Int, Int>>()
|
|
||||||
|
|
||||||
binding.references.forEach { ref ->
|
|
||||||
val key = ref.start to ref.end
|
|
||||||
if (!declKeys.contains(key)) {
|
|
||||||
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId }
|
|
||||||
if (sym != null) {
|
|
||||||
val color = keyForKind(sym.kind)
|
|
||||||
putRange(ref.start, ref.end, color)
|
|
||||||
covered += key
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Heuristics on top of binder: function call-sites and simple name-based roles
|
|
||||||
ProgressManager.checkCanceled()
|
|
||||||
|
|
||||||
// Build simple name -> role map for top-level vals/vars and parameters
|
|
||||||
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
|
||||||
mini.declarations.forEach { d ->
|
|
||||||
when (d) {
|
|
||||||
is MiniValDecl -> nameRole[d.name] =
|
|
||||||
if (d.mutable) LyngHighlighterColors.VARIABLE else LyngHighlighterColors.VALUE
|
|
||||||
|
|
||||||
is MiniFunDecl -> d.params.forEach { p -> nameRole[p.name] = LyngHighlighterColors.PARAMETER }
|
|
||||||
is MiniClassDecl -> {
|
|
||||||
d.members.forEach { m ->
|
|
||||||
if (m is MiniMemberFunDecl) {
|
|
||||||
m.params.forEach { p -> nameRole[p.name] = LyngHighlighterColors.PARAMETER }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
tokens.forEach { s ->
|
|
||||||
if (s.kind == HighlightKind.Identifier) {
|
|
||||||
val start = s.range.start
|
|
||||||
val end = s.range.endExclusive
|
|
||||||
val key = start to end
|
|
||||||
if (key !in covered && key !in declKeys) {
|
|
||||||
// Call-site detection first so it wins over var/param role
|
|
||||||
if (isFollowedByParenOrBlock(end)) {
|
|
||||||
putRange(start, end, LyngHighlighterColors.FUNCTION)
|
|
||||||
covered += key
|
|
||||||
} else {
|
|
||||||
// Simple role by known names
|
|
||||||
val ident = try {
|
|
||||||
text.substring(start, end)
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
null
|
|
||||||
}
|
|
||||||
if (ident != null) {
|
|
||||||
val roleKey = nameRole[ident]
|
|
||||||
if (roleKey != null) {
|
|
||||||
putRange(start, end, roleKey)
|
|
||||||
covered += key
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
// Must rethrow cancellation; otherwise ignore binder failures (best-effort)
|
|
||||||
if (e is com.intellij.openapi.progress.ProcessCanceledException) throw e
|
|
||||||
}
|
|
||||||
|
|
||||||
// Add annotation/label coloring using token highlighter
|
// Add annotation/label coloring using token highlighter
|
||||||
run {
|
run {
|
||||||
tokens.forEach { s ->
|
analysis.lexicalHighlights.forEach { s ->
|
||||||
if (s.kind == HighlightKind.Label) {
|
if (s.kind == HighlightKind.Label) {
|
||||||
val start = s.range.start
|
val start = s.range.start
|
||||||
val end = s.range.endExclusive
|
val end = s.range.endExclusive
|
||||||
@@ -302,7 +122,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
text.substring(wStart, wEnd)
|
text.substring(wStart, wEnd)
|
||||||
} else null
|
} else null
|
||||||
|
|
||||||
if (prevWord in setOf("return", "break", "continue") || isFollowedByParenOrBlock(end)) {
|
if (prevWord in setOf("return", "break", "continue")) {
|
||||||
putRange(start, end, LyngHighlighterColors.LABEL)
|
putRange(start, end, LyngHighlighterColors.LABEL)
|
||||||
} else {
|
} else {
|
||||||
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
||||||
@@ -315,17 +135,13 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
tokens.forEach { s ->
|
analysis.diagnostics.forEach { d ->
|
||||||
if (s.kind == HighlightKind.EnumConstant) {
|
val range = d.range ?: return@forEach
|
||||||
val start = s.range.start
|
val severity = if (d.severity == LyngDiagnosticSeverity.Warning) HighlightSeverity.WARNING else HighlightSeverity.ERROR
|
||||||
val end = s.range.endExclusive
|
diags += Diag(range.start, range.endExclusive, d.message, severity)
|
||||||
if (start in 0..end && end <= text.length && start < end) {
|
|
||||||
putRange(start, end, LyngHighlighterColors.ENUM_CONSTANT)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result(collectedInfo.modStamp, out, null)
|
return Result(collectedInfo.modStamp, out, diags)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -346,13 +162,12 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
.create()
|
.create()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show syntax error if present
|
// Show errors and warnings
|
||||||
val err = result.error
|
result.diagnostics.forEach { d ->
|
||||||
if (err != null) {
|
val start = d.start.coerceIn(0, (doc?.textLength ?: 0))
|
||||||
val start = err.start.coerceIn(0, (doc?.textLength ?: 0))
|
val end = d.end.coerceIn(start, (doc?.textLength ?: start))
|
||||||
val end = err.end.coerceIn(start, (doc?.textLength ?: start))
|
|
||||||
if (end > start) {
|
if (end > start) {
|
||||||
holder.newAnnotation(HighlightSeverity.ERROR, err.message)
|
holder.newAnnotation(d.severity, d.message)
|
||||||
.range(TextRange(start, end))
|
.range(TextRange(start, end))
|
||||||
.create()
|
.create()
|
||||||
}
|
}
|
||||||
@@ -373,30 +188,5 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
return -1
|
return -1
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the error highlight a bit wider than a single character so it is easier to see and click.
|
|
||||||
* Strategy:
|
|
||||||
* - If the offset points inside an identifier-like token (letters/digits/underscore), expand to the full token.
|
|
||||||
* - Otherwise select a small range starting at the offset with a minimum width, but not crossing the line end.
|
|
||||||
*/
|
|
||||||
private fun expandErrorRange(text: String, rawStart: Int): Pair<Int, Int> {
|
|
||||||
if (text.isEmpty()) return 0 to 0
|
|
||||||
val len = text.length
|
|
||||||
val start = rawStart.coerceIn(0, len)
|
|
||||||
fun isWord(ch: Char) = ch == '_' || ch.isLetterOrDigit()
|
|
||||||
|
|
||||||
if (start < len && isWord(text[start])) {
|
|
||||||
var s = start
|
|
||||||
var e = start
|
|
||||||
while (s > 0 && isWord(text[s - 1])) s--
|
|
||||||
while (e < len && isWord(text[e])) e++
|
|
||||||
return s to e
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not inside a word: select a short, visible range up to EOL
|
|
||||||
val lineEnd = text.indexOf('\n', start).let { if (it == -1) len else it }
|
|
||||||
val minWidth = 4
|
|
||||||
val end = (start + minWidth).coerceAtMost(lineEnd).coerceAtLeast((start + 1).coerceAtMost(lineEnd))
|
|
||||||
return start to end
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+6
-3
@@ -96,9 +96,10 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
log.info("[LYNG_DEBUG] Completion: caret=$caret prefix='${prefix}' memberDotPos=${memberDotPos} file='${file.name}'")
|
log.info("[LYNG_DEBUG] Completion: caret=$caret prefix='${prefix}' memberDotPos=${memberDotPos} file='${file.name}'")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build MiniAst (cached) for both global and member contexts to enable local class/val inference
|
// Build analysis (cached) for both global and member contexts to enable local class/val inference
|
||||||
val mini = LyngAstManager.getMiniAst(file)
|
val analysis = LyngAstManager.getAnalysis(file)
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val mini = analysis?.mini
|
||||||
|
val binding = analysis?.binding
|
||||||
|
|
||||||
// Delegate computation to the shared engine to keep behavior in sync with tests
|
// Delegate computation to the shared engine to keep behavior in sync with tests
|
||||||
val engineItems = try {
|
val engineItems = try {
|
||||||
@@ -160,6 +161,8 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withIcon(AllIcons.Nodes.Class)
|
.withIcon(AllIcons.Nodes.Class)
|
||||||
Kind.Enum -> LookupElementBuilder.create(ci.name)
|
Kind.Enum -> LookupElementBuilder.create(ci.name)
|
||||||
.withIcon(AllIcons.Nodes.Enum)
|
.withIcon(AllIcons.Nodes.Enum)
|
||||||
|
Kind.TypeAlias -> LookupElementBuilder.create(ci.name)
|
||||||
|
.withIcon(AllIcons.Nodes.Class)
|
||||||
Kind.Value -> LookupElementBuilder.create(ci.name)
|
Kind.Value -> LookupElementBuilder.create(ci.name)
|
||||||
.withIcon(AllIcons.Nodes.Variable)
|
.withIcon(AllIcons.Nodes.Variable)
|
||||||
.let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
|
.let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
|
||||||
|
|||||||
@@ -29,6 +29,8 @@ import net.sergeych.lyng.idea.LyngLanguage
|
|||||||
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.LyngLanguageTools
|
||||||
|
import net.sergeych.lyng.tools.LyngSymbolInfo
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Quick Docs backed by MiniAst: when caret is on an identifier that corresponds
|
* Quick Docs backed by MiniAst: when caret is on an identifier that corresponds
|
||||||
@@ -66,9 +68,15 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: ident='$ident' at ${idRange.startOffset}..${idRange.endOffset} in ${file.name}")
|
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: ident='$ident' at ${idRange.startOffset}..${idRange.endOffset} in ${file.name}")
|
||||||
|
|
||||||
// 1. Get merged mini-AST from Manager (handles local + .lyng.d merged declarations)
|
// 1. Get merged mini-AST from Manager (handles local + .lyng.d merged declarations)
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
val analysis = LyngAstManager.getAnalysis(file) ?: return null
|
||||||
|
val mini = analysis.mini ?: return null
|
||||||
val miniSource = mini.range.start.source
|
val miniSource = mini.range.start.source
|
||||||
val imported = DocLookupUtils.canonicalImportedModules(mini, text)
|
val imported = analysis.importedModules.ifEmpty { DocLookupUtils.canonicalImportedModules(mini, text) }
|
||||||
|
|
||||||
|
// Single-source quick doc lookup
|
||||||
|
LyngLanguageTools.docAt(analysis, offset)?.let { info ->
|
||||||
|
renderDocFromInfo(info)?.let { return it }
|
||||||
|
}
|
||||||
|
|
||||||
// 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
|
||||||
// 1) Use unified declaration detection
|
// 1) Use unified declaration detection
|
||||||
@@ -91,6 +99,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
|
is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
|
is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(d.name, m)
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -139,7 +148,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val e: Int = miniSource.offsetOf(d.range.end)
|
val e: Int = miniSource.offsetOf(d.range.end)
|
||||||
if (offset >= s && offset <= e) {
|
if (offset >= s && offset <= e) {
|
||||||
// For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
|
// For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
|
||||||
return "<div class='doc-title'>enum constant ${d.name}.${name}</div>"
|
return renderTitle("enum constant ${d.name}.${name}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -197,6 +206,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
|
is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
|
is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(cls.name, m)
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -312,11 +322,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: resolve failed for ${className}.${ident}")
|
log.info("[LYNG_DEBUG] QuickDoc: resolve failed for ${className}.${ident}")
|
||||||
@@ -354,6 +366,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
// And classes/enums
|
// And classes/enums
|
||||||
docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
|
docs.filterIsInstance<MiniTypeAliasDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
}
|
}
|
||||||
// Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
|
// Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
|
||||||
if (ident == "println" || ident == "print") {
|
if (ident == "println" || ident == "print") {
|
||||||
@@ -361,7 +374,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
"Print values to the standard output and append a newline. Accepts any number of arguments." else
|
"Print values to the standard output and append a newline. Accepts any number of arguments." else
|
||||||
"Print values to the standard output without a trailing newline. Accepts any number of arguments."
|
"Print values to the standard output without a trailing newline. Accepts any number of arguments."
|
||||||
val title = "function $ident(values)"
|
val title = "function $ident(values)"
|
||||||
return "<div class='doc-title'>${htmlEscape(title)}</div>" + styledMarkdown(htmlEscape(fallback))
|
return renderTitle(title) + styledMarkdown(htmlEscape(fallback))
|
||||||
}
|
}
|
||||||
// 4b) try class members like ClassName.member with inheritance fallback
|
// 4b) try class members like ClassName.member with inheritance fallback
|
||||||
val lhs = previousWordBefore(text, idRange.startOffset)
|
val lhs = previousWordBefore(text, idRange.startOffset)
|
||||||
@@ -372,11 +385,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -395,11 +410,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -412,11 +429,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -431,6 +450,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc("String", m)
|
is MiniMemberFunDecl -> renderMemberFunDoc("String", m)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc("String", m)
|
is MiniMemberValDecl -> renderMemberValDoc("String", m)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc("String", m)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -512,6 +532,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
is MiniFunDecl -> "function ${d.name}${signatureOf(d)}"
|
is MiniFunDecl -> "function ${d.name}${signatureOf(d)}"
|
||||||
is MiniClassDecl -> "class ${d.name}"
|
is MiniClassDecl -> "class ${d.name}"
|
||||||
is MiniEnumDecl -> "enum ${d.name} { ${d.entries.joinToString(", ")} }"
|
is MiniEnumDecl -> "enum ${d.name} { ${d.entries.joinToString(", ")} }"
|
||||||
|
is MiniTypeAliasDecl -> "type ${d.name}${typeAliasSuffix(d)}"
|
||||||
is MiniValDecl -> {
|
is MiniValDecl -> {
|
||||||
val t = d.type ?: DocLookupUtils.inferTypeRefForVal(d, text, imported, mini)
|
val t = d.type ?: DocLookupUtils.inferTypeRefForVal(d, text, imported, mini)
|
||||||
val typeStr = if (t == null) ": Object?" else typeOf(t)
|
val typeStr = if (t == null) ": Object?" else typeOf(t)
|
||||||
@@ -519,15 +540,33 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
sb.append(renderDocBody(d.doc))
|
sb.append(renderDocBody(d.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun renderDocFromInfo(info: LyngSymbolInfo): String? {
|
||||||
|
val kind = when (info.target.kind) {
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.Function -> "function"
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.Class -> "class"
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.Enum -> "enum"
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.TypeAlias -> "type"
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.Value -> "val"
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.Variable -> "var"
|
||||||
|
net.sergeych.lyng.binding.SymbolKind.Parameter -> "parameter"
|
||||||
|
}
|
||||||
|
val title = info.signature ?: "$kind ${info.target.name}"
|
||||||
|
if (title.isBlank() && info.doc == null) return null
|
||||||
|
val sb = StringBuilder()
|
||||||
|
sb.append(renderTitle(title))
|
||||||
|
sb.append(renderDocBody(info.doc))
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
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()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
|
|
||||||
// Find matching @param tag
|
// Find matching @param tag
|
||||||
fn.doc?.tags?.get("param")?.forEach { tag ->
|
fn.doc?.tags?.get("param")?.forEach { tag ->
|
||||||
@@ -549,7 +588,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val staticStr = if (m.isStatic) "static " else ""
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
val title = "${staticStr}method $className.${m.name}(${params})${ret}"
|
val title = "${staticStr}method $className.${m.name}(${params})${ret}"
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
sb.append(renderDocBody(m.doc))
|
sb.append(renderDocBody(m.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
@@ -560,11 +599,30 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val staticStr = if (m.isStatic) "static " else ""
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
val title = "${staticStr}${kind} $className.${m.name}${ts}"
|
val title = "${staticStr}${kind} $className.${m.name}${ts}"
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
sb.append(renderDocBody(m.doc))
|
sb.append(renderDocBody(m.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun renderMemberTypeAliasDoc(className: String, m: MiniMemberTypeAliasDecl): String {
|
||||||
|
val tp = if (m.typeParams.isEmpty()) "" else "<" + m.typeParams.joinToString(", ") + ">"
|
||||||
|
val body = typeOf(m.target)
|
||||||
|
val rhs = if (body.isBlank()) "" else " = ${body.removePrefix(": ")}"
|
||||||
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
|
val title = "${staticStr}type $className.${m.name}$tp$rhs"
|
||||||
|
val sb = StringBuilder()
|
||||||
|
sb.append(renderTitle(title))
|
||||||
|
sb.append(renderDocBody(m.doc))
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun typeAliasSuffix(d: MiniTypeAliasDecl): String {
|
||||||
|
val tp = if (d.typeParams.isEmpty()) "" else "<" + d.typeParams.joinToString(", ") + ">"
|
||||||
|
val body = typeOf(d.target)
|
||||||
|
val rhs = if (body.isBlank()) "" else " = ${body.removePrefix(": ")}"
|
||||||
|
return "$tp$rhs"
|
||||||
|
}
|
||||||
|
|
||||||
private fun typeOf(t: MiniTypeRef?): String {
|
private fun typeOf(t: MiniTypeRef?): String {
|
||||||
val s = DocLookupUtils.typeOf(t)
|
val s = DocLookupUtils.typeOf(t)
|
||||||
return if (s.isEmpty()) (if (t == null) ": Object?" else "") else ": $s"
|
return if (s.isEmpty()) (if (t == null) ": Object?" else "") else ": $s"
|
||||||
@@ -579,6 +637,10 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return "(${params})${ret}"
|
return "(${params})${ret}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun renderTitle(title: String): String {
|
||||||
|
return "<div class='doc-title' style='margin-bottom: 0.8em;'>${htmlEscape(title)}</div>"
|
||||||
|
}
|
||||||
|
|
||||||
private fun htmlEscape(s: String): String = buildString(s.length) {
|
private fun htmlEscape(s: String): String = buildString(s.length) {
|
||||||
for (ch in s) append(
|
for (ch in s) append(
|
||||||
when (ch) {
|
when (ch) {
|
||||||
@@ -645,7 +707,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
|
|
||||||
private fun renderOverloads(name: String, overloads: List<MiniFunDecl>): String {
|
private fun renderOverloads(name: String, overloads: List<MiniFunDecl>): String {
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>Overloads for ").append(htmlEscape(name)).append("</div>")
|
sb.append(renderTitle("Overloads for $name"))
|
||||||
sb.append("<ul>")
|
sb.append("<ul>")
|
||||||
overloads.forEach { fn ->
|
overloads.forEach { fn ->
|
||||||
sb.append("<li><code>")
|
sb.append("<li><code>")
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ class LyngLexer : LexerBase() {
|
|||||||
"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",
|
||||||
"get", "set", "object", "enum", "init", "by", "property", "constructor"
|
"get", "set", "object", "enum", "init", "by", "step", "property", "constructor"
|
||||||
)
|
)
|
||||||
|
|
||||||
override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
|
override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
|
||||||
@@ -121,12 +121,39 @@ class LyngLexer : LexerBase() {
|
|||||||
|
|
||||||
// Number
|
// Number
|
||||||
if (ch.isDigit()) {
|
if (ch.isDigit()) {
|
||||||
|
// Check for hex: 0x...
|
||||||
|
if (ch == '0' && i + 1 < endOffset && buffer[i + 1] == 'x') {
|
||||||
|
i += 2
|
||||||
|
while (i < endOffset && (buffer[i].isDigit() || buffer[i] in 'a'..'f' || buffer[i] in 'A'..'F')) i++
|
||||||
|
myTokenEnd = i
|
||||||
|
myTokenType = LyngTokenTypes.NUMBER
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decimal or integer
|
||||||
i++
|
i++
|
||||||
var hasDot = false
|
var hasDot = false
|
||||||
|
var hasE = false
|
||||||
while (i < endOffset) {
|
while (i < endOffset) {
|
||||||
val c = buffer[i]
|
val c = buffer[i]
|
||||||
if (c.isDigit()) { i++; continue }
|
if (c.isDigit() || c == '_') {
|
||||||
if (c == '.' && !hasDot) { hasDot = true; i++; continue }
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (c == '.' && !hasDot && !hasE) {
|
||||||
|
// Check if it's a fractional part (must be followed by a digit)
|
||||||
|
if (i + 1 < endOffset && buffer[i + 1].isDigit()) {
|
||||||
|
hasDot = true
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ((c == 'e' || c == 'E') && !hasE) {
|
||||||
|
hasE = true
|
||||||
|
i++
|
||||||
|
if (i < endOffset && (buffer[i] == '+' || buffer[i] == '-')) i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
@@ -161,6 +188,35 @@ class LyngLexer : LexerBase() {
|
|||||||
// Punctuation
|
// Punctuation
|
||||||
if (isPunct(ch)) {
|
if (isPunct(ch)) {
|
||||||
i++
|
i++
|
||||||
|
// Handle common multi-char operators for better highlighting
|
||||||
|
when (ch) {
|
||||||
|
'.' -> {
|
||||||
|
if (i < endOffset && buffer[i] == '.') {
|
||||||
|
i++
|
||||||
|
if (i < endOffset && (buffer[i] == '.' || buffer[i] == '<')) i++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'=' -> {
|
||||||
|
if (i < endOffset && (buffer[i] == '=' || buffer[i] == '>' || buffer[i] == '~')) {
|
||||||
|
i++
|
||||||
|
if (buffer[i - 1] == '=' && i < endOffset && buffer[i] == '=') i++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'+', '-', '*', '/', '%', '!', '<', '>', '&', '|', '?', ':', '^' -> {
|
||||||
|
if (i < endOffset) {
|
||||||
|
val next = buffer[i]
|
||||||
|
if (next == '=' || next == ch) {
|
||||||
|
i++
|
||||||
|
if (ch == '<' && next == '=' && i < endOffset && buffer[i] == '>') i++
|
||||||
|
if (ch == '!' && next == '=' && i < endOffset && buffer[i] == '=') i++
|
||||||
|
} else if (ch == '?' && (next == '.' || next == '[' || next == '(' || next == '{' || next == ':' || next == '?')) {
|
||||||
|
i++
|
||||||
|
} else if (ch == '-' && next == '>') {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
myTokenType = LyngTokenTypes.PUNCT
|
myTokenType = LyngTokenTypes.PUNCT
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -36,9 +36,10 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
val name = element.text ?: ""
|
val name = element.text ?: ""
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
val analysis = LyngAstManager.getAnalysis(file) ?: return emptyArray()
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val mini = analysis.mini ?: return emptyArray()
|
||||||
val imported = DocLookupUtils.canonicalImportedModules(mini, text).toSet()
|
val binding = analysis.binding
|
||||||
|
val imported = analysis.importedModules.toSet()
|
||||||
val currentPackage = getPackageName(file)
|
val currentPackage = getPackageName(file)
|
||||||
val allowedPackages = if (currentPackage != null) imported + currentPackage else imported
|
val allowedPackages = if (currentPackage != null) imported + currentPackage else imported
|
||||||
|
|
||||||
@@ -64,11 +65,13 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
val kind = when(member) {
|
val kind = when(member) {
|
||||||
is MiniMemberFunDecl -> "Function"
|
is MiniMemberFunDecl -> "Function"
|
||||||
is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
|
is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
|
||||||
|
is MiniMemberTypeAliasDecl -> "TypeAlias"
|
||||||
is MiniInitDecl -> "Initializer"
|
is MiniInitDecl -> "Initializer"
|
||||||
is MiniFunDecl -> "Function"
|
is MiniFunDecl -> "Function"
|
||||||
is MiniValDecl -> if (member.mutable) "Variable" else "Value"
|
is MiniValDecl -> if (member.mutable) "Variable" else "Value"
|
||||||
is MiniClassDecl -> "Class"
|
is MiniClassDecl -> "Class"
|
||||||
is MiniEnumDecl -> "Enum"
|
is MiniEnumDecl -> "Enum"
|
||||||
|
is MiniTypeAliasDecl -> "TypeAlias"
|
||||||
}
|
}
|
||||||
results.add(PsiElementResolveResult(LyngDeclarationElement(it, member.name, kind)))
|
results.add(PsiElementResolveResult(LyngDeclarationElement(it, member.name, kind)))
|
||||||
}
|
}
|
||||||
@@ -199,6 +202,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
is net.sergeych.lyng.miniast.MiniClassDecl -> "Class"
|
is net.sergeych.lyng.miniast.MiniClassDecl -> "Class"
|
||||||
is net.sergeych.lyng.miniast.MiniEnumDecl -> "Enum"
|
is net.sergeych.lyng.miniast.MiniEnumDecl -> "Enum"
|
||||||
is net.sergeych.lyng.miniast.MiniValDecl -> if (d.mutable) "Variable" else "Value"
|
is net.sergeych.lyng.miniast.MiniValDecl -> if (d.mutable) "Variable" else "Value"
|
||||||
|
is net.sergeych.lyng.miniast.MiniTypeAliasDecl -> "TypeAlias"
|
||||||
}
|
}
|
||||||
addIfMatch(d.name, d.nameStart, dKind)
|
addIfMatch(d.name, d.nameStart, dKind)
|
||||||
}
|
}
|
||||||
@@ -214,6 +218,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
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"
|
||||||
|
is net.sergeych.lyng.miniast.MiniMemberTypeAliasDecl -> "TypeAlias"
|
||||||
is net.sergeych.lyng.miniast.MiniInitDecl -> "Initializer"
|
is net.sergeych.lyng.miniast.MiniInitDecl -> "Initializer"
|
||||||
}
|
}
|
||||||
addIfMatch(m.name, m.nameStart, mKind)
|
addIfMatch(m.name, m.nameStart, mKind)
|
||||||
|
|||||||
@@ -22,55 +22,21 @@ 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 kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.binding.Binder
|
|
||||||
import net.sergeych.lyng.binding.BindingSnapshot
|
import net.sergeych.lyng.binding.BindingSnapshot
|
||||||
import net.sergeych.lyng.miniast.MiniAstBuilder
|
import net.sergeych.lyng.miniast.DocLookupUtils
|
||||||
import net.sergeych.lyng.miniast.MiniScript
|
import net.sergeych.lyng.miniast.MiniScript
|
||||||
|
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")
|
||||||
|
|
||||||
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
||||||
val vFile = file.virtualFile ?: return@runReadAction null
|
getAnalysis(file)?.mini
|
||||||
val combinedStamp = getCombinedStamp(file)
|
|
||||||
|
|
||||||
val prevStamp = file.getUserData(STAMP_KEY)
|
|
||||||
val cached = file.getUserData(MINI_KEY)
|
|
||||||
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
|
||||||
|
|
||||||
val text = file.viewProvider.contents.toString()
|
|
||||||
val sink = MiniAstBuilder()
|
|
||||||
val built = try {
|
|
||||||
val provider = IdeLenientImportProvider.create()
|
|
||||||
val src = Source(file.name, text)
|
|
||||||
runBlocking { Compiler.compileWithMini(src, provider, sink) }
|
|
||||||
val script = sink.build()
|
|
||||||
if (script != null && !file.name.endsWith(".lyng.d")) {
|
|
||||||
val dFiles = collectDeclarationFiles(file)
|
|
||||||
for (df in dFiles) {
|
|
||||||
val scriptD = getMiniAst(df)
|
|
||||||
if (scriptD != null) {
|
|
||||||
script.declarations.addAll(scriptD.declarations)
|
|
||||||
script.imports.addAll(scriptD.imports)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
script
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
sink.build()
|
|
||||||
}
|
|
||||||
|
|
||||||
if (built != null) {
|
|
||||||
file.putUserData(MINI_KEY, built)
|
|
||||||
file.putUserData(STAMP_KEY, combinedStamp)
|
|
||||||
// Invalidate binding too
|
|
||||||
file.putUserData(BINDING_KEY, null)
|
|
||||||
}
|
|
||||||
built
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
||||||
@@ -102,32 +68,53 @@ object LyngAstManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
||||||
|
getAnalysis(file)?.binding
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getAnalysis(file: PsiFile): LyngAnalysisResult? = runReadAction {
|
||||||
val vFile = file.virtualFile ?: return@runReadAction null
|
val vFile = file.virtualFile ?: return@runReadAction null
|
||||||
var combinedStamp = file.viewProvider.modificationStamp
|
val combinedStamp = getCombinedStamp(file)
|
||||||
|
|
||||||
val dFiles = if (!file.name.endsWith(".lyng.d")) collectDeclarationFiles(file) else emptyList()
|
|
||||||
for (df in dFiles) {
|
|
||||||
combinedStamp += df.viewProvider.modificationStamp
|
|
||||||
}
|
|
||||||
|
|
||||||
val prevStamp = file.getUserData(STAMP_KEY)
|
val prevStamp = file.getUserData(STAMP_KEY)
|
||||||
val cached = file.getUserData(BINDING_KEY)
|
val cached = file.getUserData(ANALYSIS_KEY)
|
||||||
|
|
||||||
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
||||||
|
|
||||||
val mini = getMiniAst(file) ?: return@runReadAction null
|
|
||||||
val text = file.viewProvider.contents.toString()
|
val text = file.viewProvider.contents.toString()
|
||||||
val binding = try {
|
val built = try {
|
||||||
Binder.bind(text, mini)
|
val provider = IdeLenientImportProvider.create()
|
||||||
|
runBlocking {
|
||||||
|
LyngLanguageTools.analyze(
|
||||||
|
LyngAnalysisRequest(text = text, fileName = file.name, importProvider = provider)
|
||||||
|
)
|
||||||
|
}
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
if (binding != null) {
|
if (built != null) {
|
||||||
file.putUserData(BINDING_KEY, binding)
|
val merged = built.mini
|
||||||
// stamp is already set by getMiniAst or we set it here if getMiniAst was cached
|
if (merged != null && !file.name.endsWith(".lyng.d")) {
|
||||||
|
val dFiles = collectDeclarationFiles(file)
|
||||||
|
for (df in dFiles) {
|
||||||
|
val dAnalysis = getAnalysis(df)
|
||||||
|
val dMini = dAnalysis?.mini ?: continue
|
||||||
|
merged.declarations.addAll(dMini.declarations)
|
||||||
|
merged.imports.addAll(dMini.imports)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val finalAnalysis = if (merged != null) {
|
||||||
|
built.copy(
|
||||||
|
mini = merged,
|
||||||
|
importedModules = DocLookupUtils.canonicalImportedModules(merged, text)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
built
|
||||||
|
}
|
||||||
|
file.putUserData(ANALYSIS_KEY, finalAnalysis)
|
||||||
|
file.putUserData(MINI_KEY, finalAnalysis.mini)
|
||||||
|
file.putUserData(BINDING_KEY, finalAnalysis.binding)
|
||||||
file.putUserData(STAMP_KEY, combinedStamp)
|
file.putUserData(STAMP_KEY, combinedStamp)
|
||||||
|
return@runReadAction finalAnalysis
|
||||||
}
|
}
|
||||||
binding
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -27,7 +27,9 @@ import com.github.ajalt.clikt.parameters.arguments.optional
|
|||||||
import com.github.ajalt.clikt.parameters.options.flag
|
import com.github.ajalt.clikt.parameters.options.flag
|
||||||
import com.github.ajalt.clikt.parameters.options.option
|
import com.github.ajalt.clikt.parameters.options.option
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import net.sergeych.lyng.Compiler
|
||||||
import net.sergeych.lyng.LyngVersion
|
import net.sergeych.lyng.LyngVersion
|
||||||
|
import net.sergeych.lyng.Pos
|
||||||
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
|
||||||
@@ -156,6 +158,7 @@ private class Lyng(val launcher: (suspend () -> Unit) -> Unit) : CliktCommand()
|
|||||||
|
|
||||||
val version by option("-v", "--version", help = "Print version and exit").flag()
|
val version by option("-v", "--version", help = "Print version and exit").flag()
|
||||||
val benchmark by option("--benchmark", help = "Run JVM microbenchmarks and exit").flag()
|
val benchmark by option("--benchmark", help = "Run JVM microbenchmarks and exit").flag()
|
||||||
|
val bytecodeFallbacks by option("--bytecode-fallbacks", help = "Report lambdas that fall back to interpreter").flag()
|
||||||
val script by argument(help = "one or more scripts to execute").optional()
|
val script by argument(help = "one or more scripts to execute").optional()
|
||||||
val execute: String? by option(
|
val execute: String? by option(
|
||||||
"-x", "--execute", help = """
|
"-x", "--execute", help = """
|
||||||
@@ -198,7 +201,15 @@ private class Lyng(val launcher: (suspend () -> Unit) -> Unit) : CliktCommand()
|
|||||||
launcher {
|
launcher {
|
||||||
// there is no script name, it is a first argument instead:
|
// there is no script name, it is a first argument instead:
|
||||||
processErrors {
|
processErrors {
|
||||||
baseScope.eval(execute!!)
|
val reporter = bytecodeFallbackReporter(bytecodeFallbacks)
|
||||||
|
val script = Compiler.compileWithResolution(
|
||||||
|
Source("<eval>", execute!!),
|
||||||
|
baseScope.currentImportProvider,
|
||||||
|
seedScope = baseScope,
|
||||||
|
bytecodeFallbackReporter = reporter
|
||||||
|
)
|
||||||
|
script.execute(baseScope)
|
||||||
|
flushBytecodeFallbacks(reporter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -209,7 +220,7 @@ private class Lyng(val launcher: (suspend () -> Unit) -> Unit) : CliktCommand()
|
|||||||
echoFormattedHelp()
|
echoFormattedHelp()
|
||||||
} else {
|
} else {
|
||||||
baseScope.addConst("ARGV", ObjList(args.map { ObjString(it) }.toMutableList()))
|
baseScope.addConst("ARGV", ObjList(args.map { ObjString(it) }.toMutableList()))
|
||||||
launcher { executeFile(script!!) }
|
launcher { executeFile(script!!, bytecodeFallbacks) }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -217,14 +228,14 @@ private class Lyng(val launcher: (suspend () -> Unit) -> Unit) : CliktCommand()
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun executeFileWithArgs(fileName: String, args: List<String>) {
|
fun executeFileWithArgs(fileName: String, args: List<String>, reportBytecodeFallbacks: Boolean = false) {
|
||||||
runBlocking {
|
runBlocking {
|
||||||
baseScopeDefer.await().addConst("ARGV", ObjList(args.map { ObjString(it) }.toMutableList()))
|
baseScopeDefer.await().addConst("ARGV", ObjList(args.map { ObjString(it) }.toMutableList()))
|
||||||
executeFile(fileName)
|
executeFile(fileName, reportBytecodeFallbacks)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun executeFile(fileName: String) {
|
suspend fun executeFile(fileName: String, reportBytecodeFallbacks: Boolean = false) {
|
||||||
var text = FileSystem.SYSTEM.source(fileName.toPath()).use { fileSource ->
|
var text = FileSystem.SYSTEM.source(fileName.toPath()).use { fileSource ->
|
||||||
fileSource.buffer().use { bs ->
|
fileSource.buffer().use { bs ->
|
||||||
bs.readUtf8()
|
bs.readUtf8()
|
||||||
@@ -236,7 +247,16 @@ suspend fun executeFile(fileName: String) {
|
|||||||
text = text.substring(pos + 1)
|
text = text.substring(pos + 1)
|
||||||
}
|
}
|
||||||
processErrors {
|
processErrors {
|
||||||
baseScopeDefer.await().eval(Source(fileName, text))
|
val scope = baseScopeDefer.await()
|
||||||
|
val reporter = bytecodeFallbackReporter(reportBytecodeFallbacks)
|
||||||
|
val script = Compiler.compileWithResolution(
|
||||||
|
Source(fileName, text),
|
||||||
|
scope.currentImportProvider,
|
||||||
|
seedScope = scope,
|
||||||
|
bytecodeFallbackReporter = reporter
|
||||||
|
)
|
||||||
|
script.execute(scope)
|
||||||
|
flushBytecodeFallbacks(reporter)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -248,3 +268,22 @@ suspend fun processErrors(block: suspend () -> Unit) {
|
|||||||
println("\nError executing the script:\n$e\n")
|
println("\nError executing the script:\n$e\n")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun bytecodeFallbackReporter(enabled: Boolean): ((Pos, String) -> Unit)? {
|
||||||
|
if (!enabled) return null
|
||||||
|
val reports = ArrayList<String>()
|
||||||
|
val reporter: (Pos, String) -> Unit = { pos, msg ->
|
||||||
|
reports.add("$pos: $msg")
|
||||||
|
}
|
||||||
|
return object : (Pos, String) -> Unit by reporter {
|
||||||
|
override fun invoke(pos: Pos, msg: String) = reporter(pos, msg)
|
||||||
|
override fun toString(): String = reports.joinToString("\n")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun flushBytecodeFallbacks(reporter: ((Pos, String) -> Unit)?) {
|
||||||
|
val text = reporter?.toString().orEmpty()
|
||||||
|
if (text.isBlank()) return
|
||||||
|
println("Bytecode lambda fallbacks:")
|
||||||
|
println(text)
|
||||||
|
}
|
||||||
@@ -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.
|
||||||
@@ -56,7 +56,7 @@ class FsIntegrationJvmTest {
|
|||||||
"""
|
"""
|
||||||
import lyng.io.fs
|
import lyng.io.fs
|
||||||
// list current folder files
|
// list current folder files
|
||||||
println( Path(".").list().toList() )
|
println( Path(".").list() )
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -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.2.0"
|
version = "1.3.0-SNAPSHOT"
|
||||||
|
|
||||||
// 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
|
||||||
|
|
||||||
@@ -97,6 +97,7 @@ kotlin {
|
|||||||
kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
|
kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
|
||||||
//put your multiplatform dependencies here
|
//put your multiplatform dependencies here
|
||||||
api(libs.kotlinx.coroutines.core)
|
api(libs.kotlinx.coroutines.core)
|
||||||
api(libs.mp.bintools)
|
api(libs.mp.bintools)
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
actual object Benchmarks {
|
||||||
|
actual val enabled: Boolean = run {
|
||||||
|
val p = System.getProperty("LYNG_BENCHMARKS")?.lowercase()
|
||||||
|
val e = System.getenv("BENCHMARKS")?.lowercase()
|
||||||
|
fun parse(v: String?): Boolean =
|
||||||
|
v == "true" || v == "1" || v == "yes"
|
||||||
|
parse(p) || parse(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -42,4 +42,4 @@ actual object PerfDefaults {
|
|||||||
actual val ARG_SMALL_ARITY_12: Boolean = false
|
actual val ARG_SMALL_ARITY_12: Boolean = false
|
||||||
actual val INDEX_PIC_SIZE_4: Boolean = false
|
actual val INDEX_PIC_SIZE_4: Boolean = false
|
||||||
actual val RANGE_FAST_ITER: Boolean = false
|
actual val RANGE_FAST_ITER: Boolean = false
|
||||||
}
|
}
|
||||||
@@ -20,6 +20,7 @@ package net.sergeych.lyng
|
|||||||
import net.sergeych.lyng.miniast.MiniTypeRef
|
import net.sergeych.lyng.miniast.MiniTypeRef
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjList
|
import net.sergeych.lyng.obj.ObjList
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
import net.sergeych.lyng.obj.ObjRecord
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -61,28 +62,59 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (!hasComplex) {
|
if (!hasComplex) {
|
||||||
if (arguments.list.size != params.size)
|
if (arguments.list.size > params.size)
|
||||||
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
if (arguments.list.size < params.size) {
|
||||||
|
for (i in arguments.list.size until params.size) {
|
||||||
|
val a = params[i]
|
||||||
|
if (!a.type.isNullable) {
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
for (i in params.indices) {
|
for (i in params.indices) {
|
||||||
val a = params[i]
|
val a = params[i]
|
||||||
val value = arguments.list[i]
|
val value = if (i < arguments.list.size) arguments.list[i] else ObjNull
|
||||||
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
val recordType = if (declaringClass != null && a.accessType != null) {
|
||||||
|
ObjRecord.Type.ConstructorField
|
||||||
|
} else {
|
||||||
|
ObjRecord.Type.Argument
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
a.name,
|
||||||
|
(a.accessType ?: defaultAccessType).isMutable,
|
||||||
value.byValueCopy(),
|
value.byValueCopy(),
|
||||||
a.visibility ?: defaultVisibility,
|
a.visibility ?: defaultVisibility,
|
||||||
recordType = ObjRecord.Type.Argument,
|
recordType = recordType,
|
||||||
declaringClass = declaringClass)
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient
|
||||||
|
)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun assign(a: Item, value: Obj) {
|
fun assign(a: Item, value: Obj) {
|
||||||
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
val recordType = if (declaringClass != null && a.accessType != null) {
|
||||||
|
ObjRecord.Type.ConstructorField
|
||||||
|
} else {
|
||||||
|
ObjRecord.Type.Argument
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
a.name,
|
||||||
|
(a.accessType ?: defaultAccessType).isMutable,
|
||||||
value.byValueCopy(),
|
value.byValueCopy(),
|
||||||
a.visibility ?: defaultVisibility,
|
a.visibility ?: defaultVisibility,
|
||||||
recordType = ObjRecord.Type.Argument,
|
recordType = recordType,
|
||||||
declaringClass = declaringClass)
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun missingValue(a: Item, error: String): Obj {
|
||||||
|
return a.defaultValue?.execute(scope)
|
||||||
|
?: if (a.type.isNullable) ObjNull else scope.raiseIllegalArgument(error)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare positional args and parameter count, handle tail-block binding
|
// Prepare positional args and parameter count, handle tail-block binding
|
||||||
@@ -163,8 +195,7 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
assign(a, namedValues[i]!!)
|
assign(a, namedValues[i]!!)
|
||||||
} else {
|
} else {
|
||||||
val value = if (hp < callArgs.size) callArgs[hp++]
|
val value = if (hp < callArgs.size) callArgs[hp++]
|
||||||
else a.defaultValue?.execute(scope)
|
else missingValue(a, "too few arguments for the call (missing ${a.name})")
|
||||||
?: scope.raiseIllegalArgument("too few arguments for the call (missing ${a.name})")
|
|
||||||
assign(a, value)
|
assign(a, value)
|
||||||
}
|
}
|
||||||
i++
|
i++
|
||||||
@@ -184,8 +215,7 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
assign(a, namedValues[i]!!)
|
assign(a, namedValues[i]!!)
|
||||||
} else {
|
} else {
|
||||||
val value = if (tp >= headPosBound) callArgs[tp--]
|
val value = if (tp >= headPosBound) callArgs[tp--]
|
||||||
else a.defaultValue?.execute(scope)
|
else missingValue(a, "too few arguments for the call")
|
||||||
?: scope.raiseIllegalArgument("too few arguments for the call")
|
|
||||||
assign(a, value)
|
assign(a, value)
|
||||||
}
|
}
|
||||||
i--
|
i--
|
||||||
@@ -220,6 +250,212 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Assign arguments directly into frame slots using [paramSlotPlan] without creating scope locals.
|
||||||
|
* Still allows default expressions to evaluate by exposing FrameSlotRef facades in [scope].
|
||||||
|
*/
|
||||||
|
suspend fun assignToFrame(
|
||||||
|
scope: Scope,
|
||||||
|
arguments: Arguments = scope.args,
|
||||||
|
paramSlotPlan: Map<String, Int>,
|
||||||
|
frame: FrameAccess,
|
||||||
|
slotOffset: Int = 0,
|
||||||
|
defaultAccessType: AccessType = AccessType.Var,
|
||||||
|
defaultVisibility: Visibility = Visibility.Public,
|
||||||
|
declaringClass: net.sergeych.lyng.obj.ObjClass? = scope.currentClassCtx
|
||||||
|
) {
|
||||||
|
fun slotFor(name: String): Int {
|
||||||
|
val full = paramSlotPlan[name] ?: scope.raiseIllegalState("parameter slot for '$name' is missing")
|
||||||
|
val slot = full - slotOffset
|
||||||
|
if (slot < 0) scope.raiseIllegalState("parameter slot for '$name' is out of range")
|
||||||
|
return slot
|
||||||
|
}
|
||||||
|
|
||||||
|
fun ensureScopeRef(a: Item, slot: Int, recordType: ObjRecord.Type) {
|
||||||
|
if (scope.getLocalRecordDirect(a.name) != null) return
|
||||||
|
scope.addItem(
|
||||||
|
a.name,
|
||||||
|
(a.accessType ?: defaultAccessType).isMutable,
|
||||||
|
FrameSlotRef(frame, slot),
|
||||||
|
a.visibility ?: defaultVisibility,
|
||||||
|
recordType = recordType,
|
||||||
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setFrameValue(slot: Int, value: Obj) {
|
||||||
|
when (value) {
|
||||||
|
is net.sergeych.lyng.obj.ObjInt -> frame.setInt(slot, value.value)
|
||||||
|
is net.sergeych.lyng.obj.ObjReal -> frame.setReal(slot, value.value)
|
||||||
|
is net.sergeych.lyng.obj.ObjBool -> frame.setBool(slot, value.value)
|
||||||
|
else -> frame.setObj(slot, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun assign(a: Item, value: Obj) {
|
||||||
|
val recordType = if (declaringClass != null && a.accessType != null) {
|
||||||
|
ObjRecord.Type.ConstructorField
|
||||||
|
} else {
|
||||||
|
ObjRecord.Type.Argument
|
||||||
|
}
|
||||||
|
val slot = slotFor(a.name)
|
||||||
|
setFrameValue(slot, value.byValueCopy())
|
||||||
|
ensureScopeRef(a, slot, recordType)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun missingValue(a: Item, error: String): Obj {
|
||||||
|
return a.defaultValue?.execute(scope)
|
||||||
|
?: if (a.type.isNullable) ObjNull else scope.raiseIllegalArgument(error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fast path for simple positional-only calls with no ellipsis and no defaults
|
||||||
|
if (arguments.named.isEmpty() && !arguments.tailBlockMode) {
|
||||||
|
var hasComplex = false
|
||||||
|
for (p in params) {
|
||||||
|
if (p.isEllipsis || p.defaultValue != null) {
|
||||||
|
hasComplex = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!hasComplex) {
|
||||||
|
if (arguments.list.size > params.size)
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
if (arguments.list.size < params.size) {
|
||||||
|
for (i in arguments.list.size until params.size) {
|
||||||
|
val a = params[i]
|
||||||
|
if (!a.type.isNullable) {
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i in params.indices) {
|
||||||
|
val a = params[i]
|
||||||
|
val value = if (i < arguments.list.size) arguments.list[i] else ObjNull
|
||||||
|
assign(a, value)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prepare positional args and parameter count, handle tail-block binding
|
||||||
|
val callArgs: List<Obj>
|
||||||
|
val paramsSize: Int
|
||||||
|
if (arguments.tailBlockMode) {
|
||||||
|
val lastParam = params.last()
|
||||||
|
if (arguments.named.containsKey(lastParam.name))
|
||||||
|
scope.raiseIllegalArgument("trailing block cannot be used when the last parameter is already assigned by a named argument")
|
||||||
|
paramsSize = params.size - 1
|
||||||
|
assign(lastParam, arguments.list.last())
|
||||||
|
callArgs = arguments.list.dropLast(1)
|
||||||
|
} else {
|
||||||
|
paramsSize = params.size
|
||||||
|
callArgs = arguments.list
|
||||||
|
}
|
||||||
|
|
||||||
|
val coveredByPositional = BooleanArray(paramsSize)
|
||||||
|
run {
|
||||||
|
var headRequired = 0
|
||||||
|
var tailRequired = 0
|
||||||
|
val ellipsisIdx = params.subList(0, paramsSize).indexOfFirst { it.isEllipsis }
|
||||||
|
if (ellipsisIdx >= 0) {
|
||||||
|
for (i in 0 until ellipsisIdx) if (!params[i].isEllipsis && params[i].defaultValue == null) headRequired++
|
||||||
|
for (i in paramsSize - 1 downTo ellipsisIdx + 1) if (params[i].defaultValue == null) tailRequired++
|
||||||
|
} else {
|
||||||
|
for (i in 0 until paramsSize) if (params[i].defaultValue == null) headRequired++
|
||||||
|
}
|
||||||
|
val P = callArgs.size
|
||||||
|
if (ellipsisIdx < 0) {
|
||||||
|
val k = minOf(P, paramsSize)
|
||||||
|
for (i in 0 until k) coveredByPositional[i] = true
|
||||||
|
} else {
|
||||||
|
val headTake = minOf(P, headRequired)
|
||||||
|
for (i in 0 until headTake) coveredByPositional[i] = true
|
||||||
|
val remaining = P - headTake
|
||||||
|
val tailTake = minOf(remaining, tailRequired)
|
||||||
|
var j = paramsSize - 1
|
||||||
|
var taken = 0
|
||||||
|
while (j > ellipsisIdx && taken < tailTake) {
|
||||||
|
coveredByPositional[j] = true
|
||||||
|
j--
|
||||||
|
taken++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val assignedByName = BooleanArray(paramsSize)
|
||||||
|
val namedValues = arrayOfNulls<Obj>(paramsSize)
|
||||||
|
if (arguments.named.isNotEmpty()) {
|
||||||
|
for ((k, v) in arguments.named) {
|
||||||
|
val idx = params.subList(0, paramsSize).indexOfFirst { it.name == k }
|
||||||
|
if (idx < 0) scope.raiseIllegalArgument("unknown parameter '$k'")
|
||||||
|
if (params[idx].isEllipsis) scope.raiseIllegalArgument("ellipsis (variadic) parameter cannot be assigned by name: '$k'")
|
||||||
|
if (coveredByPositional[idx]) scope.raiseIllegalArgument("argument '$k' is already set by positional argument")
|
||||||
|
if (assignedByName[idx]) scope.raiseIllegalArgument("argument '$k' is already set")
|
||||||
|
assignedByName[idx] = true
|
||||||
|
namedValues[idx] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun processHead(index: Int, headPos: Int): Pair<Int, Int> {
|
||||||
|
var i = index
|
||||||
|
var hp = headPos
|
||||||
|
while (i < paramsSize) {
|
||||||
|
val a = params[i]
|
||||||
|
if (a.isEllipsis) break
|
||||||
|
if (assignedByName[i]) {
|
||||||
|
assign(a, namedValues[i]!!)
|
||||||
|
} else {
|
||||||
|
val value = if (hp < callArgs.size) callArgs[hp++]
|
||||||
|
else missingValue(a, "too few arguments for the call (missing ${a.name})")
|
||||||
|
assign(a, value)
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return i to hp
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun processTail(startExclusive: Int, tailStart: Int, headPosBound: Int): Int {
|
||||||
|
var i = paramsSize - 1
|
||||||
|
var tp = tailStart
|
||||||
|
while (i > startExclusive) {
|
||||||
|
val a = params[i]
|
||||||
|
if (a.isEllipsis) break
|
||||||
|
if (i < assignedByName.size && assignedByName[i]) {
|
||||||
|
assign(a, namedValues[i]!!)
|
||||||
|
} else {
|
||||||
|
val value = if (tp >= headPosBound) callArgs[tp--]
|
||||||
|
else missingValue(a, "too few arguments for the call")
|
||||||
|
assign(a, value)
|
||||||
|
}
|
||||||
|
i--
|
||||||
|
}
|
||||||
|
return tp
|
||||||
|
}
|
||||||
|
|
||||||
|
fun processEllipsis(index: Int, headPos: Int, tailPos: Int) {
|
||||||
|
val a = params[index]
|
||||||
|
val from = headPos
|
||||||
|
val to = tailPos
|
||||||
|
val l = if (from > to) ObjList()
|
||||||
|
else ObjList(callArgs.subList(from, to + 1).toMutableList())
|
||||||
|
assign(a, l)
|
||||||
|
}
|
||||||
|
|
||||||
|
val ellipsisIndex = params.subList(0, paramsSize).indexOfFirst { it.isEllipsis }
|
||||||
|
|
||||||
|
if (ellipsisIndex >= 0) {
|
||||||
|
val (_, headConsumedTo) = processHead(0, 0)
|
||||||
|
val tailConsumedFrom = processTail(ellipsisIndex, callArgs.size - 1, headConsumedTo)
|
||||||
|
processEllipsis(ellipsisIndex, headConsumedTo, tailConsumedFrom)
|
||||||
|
} else {
|
||||||
|
val (_, headConsumedTo) = processHead(0, 0)
|
||||||
|
if (headConsumedTo != callArgs.size)
|
||||||
|
scope.raiseIllegalArgument("too many arguments for the call")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Single argument declaration descriptor.
|
* Single argument declaration descriptor.
|
||||||
*
|
*
|
||||||
@@ -239,5 +475,6 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
val defaultValue: Statement? = null,
|
val defaultValue: Statement? = null,
|
||||||
val accessType: AccessType? = null,
|
val accessType: AccessType? = null,
|
||||||
val visibility: Visibility? = null,
|
val visibility: Visibility? = null,
|
||||||
|
val isTransient: Boolean = false,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -37,7 +37,7 @@ data class ParsedArgument(
|
|||||||
count++
|
count++
|
||||||
if (count > limit) break
|
if (count > limit) break
|
||||||
}
|
}
|
||||||
if (!hasSplatOrNamed && count == this.size) {
|
if (!hasSplatOrNamed && count == this.size) {
|
||||||
val quick = when (count) {
|
val quick = when (count) {
|
||||||
0 -> Arguments.EMPTY
|
0 -> Arguments.EMPTY
|
||||||
1 -> Arguments(listOf(this.elementAt(0).value.execute(scope)), tailBlockMode)
|
1 -> Arguments(listOf(this.elementAt(0).value.execute(scope)), tailBlockMode)
|
||||||
@@ -154,11 +154,11 @@ data class ParsedArgument(
|
|||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
if (quick != null) return quick
|
if (quick != null) return quick
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// General path: build positional list and named map, enforcing ordering rules
|
// General path: build positional list and named map, enforcing ordering rules
|
||||||
val positional: MutableList<Obj> = mutableListOf()
|
val positional: MutableList<Obj> = mutableListOf()
|
||||||
var named: MutableMap<String, Obj>? = null
|
var named: MutableMap<String, Obj>? = null
|
||||||
var namedSeen = false
|
var namedSeen = false
|
||||||
for ((idx, x) in this.withIndex()) {
|
for ((idx, x) in this.withIndex()) {
|
||||||
@@ -254,4 +254,3 @@ data class ParsedArgument(
|
|||||||
fun from(values: Collection<Obj>) = Arguments(values.toList())
|
fun from(values: Collection<Obj>) = Arguments(values.toList())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -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
|
||||||
|
|
||||||
|
expect object Benchmarks {
|
||||||
|
val enabled: Boolean
|
||||||
|
}
|
||||||
@@ -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.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
|
||||||
|
class BlockStatement(
|
||||||
|
val block: Script,
|
||||||
|
val slotPlan: Map<String, Int>,
|
||||||
|
val scopeId: Int,
|
||||||
|
val captureSlots: List<CaptureSlot> = emptyList(),
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val target = if (scope.skipScopeCreation) scope else scope.createChildScope(startPos)
|
||||||
|
if (slotPlan.isNotEmpty()) target.applySlotPlan(slotPlan)
|
||||||
|
if (captureSlots.isNotEmpty()) {
|
||||||
|
val captureRecords = scope.captureRecords
|
||||||
|
if (captureRecords != null) {
|
||||||
|
for (i in captureSlots.indices) {
|
||||||
|
val capture = captureSlots[i]
|
||||||
|
val rec = captureRecords.getOrNull(i)
|
||||||
|
?: scope.raiseSymbolNotFound("capture ${capture.name} not found")
|
||||||
|
target.updateSlotFor(capture.name, rec)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val applyScope = scope as? ApplyScope
|
||||||
|
for (capture in captureSlots) {
|
||||||
|
// Interpreter-only capture resolution; bytecode paths must use captureRecords instead.
|
||||||
|
val rec = if (applyScope != null) {
|
||||||
|
applyScope.resolveCaptureRecord(capture.name)
|
||||||
|
?: applyScope.callScope.resolveCaptureRecord(capture.name)
|
||||||
|
} else {
|
||||||
|
scope.resolveCaptureRecord(capture.name)
|
||||||
|
}
|
||||||
|
if (rec == null) {
|
||||||
|
if (scope.getSlotIndexOf(capture.name) == null && scope.getLocalRecordDirect(capture.name) == null) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
(applyScope?.callScope ?: scope)
|
||||||
|
.raiseSymbolNotFound("symbol ${capture.name} not found")
|
||||||
|
}
|
||||||
|
target.updateSlotFor(capture.name, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return block.execute(target)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun statements(): List<Statement> = block.debugStatements()
|
||||||
|
|
||||||
|
}
|
||||||
@@ -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.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.bytecode.BytecodeStatement
|
||||||
|
|
||||||
|
interface BytecodeBodyProvider {
|
||||||
|
fun bytecodeBody(): BytecodeStatement?
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
interface BytecodeCallable
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compile-time call metadata for known functions. Used to select lambda receiver semantics.
|
||||||
|
*/
|
||||||
|
data class CallSignature(
|
||||||
|
val tailBlockReceiverType: String? = null
|
||||||
|
)
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
data class CaptureSlot(
|
||||||
|
val name: String,
|
||||||
|
)
|
||||||
@@ -0,0 +1,163 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjException
|
||||||
|
import net.sergeych.lyng.obj.ObjInstance
|
||||||
|
import net.sergeych.lyng.obj.ObjInstanceClass
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
|
data class ClassDeclBaseSpec(
|
||||||
|
val name: String,
|
||||||
|
val args: List<ParsedArgument>?
|
||||||
|
)
|
||||||
|
|
||||||
|
data class ClassDeclSpec(
|
||||||
|
val declaredName: String?,
|
||||||
|
val className: String,
|
||||||
|
val typeName: String,
|
||||||
|
val startPos: Pos,
|
||||||
|
val isExtern: Boolean,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isObject: Boolean,
|
||||||
|
val isAnonymous: Boolean,
|
||||||
|
val baseSpecs: List<ClassDeclBaseSpec>,
|
||||||
|
val constructorArgs: ArgsDeclaration?,
|
||||||
|
val constructorFieldIds: Map<String, Int>?,
|
||||||
|
val bodyInit: Statement?,
|
||||||
|
val initScope: List<Statement>,
|
||||||
|
)
|
||||||
|
|
||||||
|
internal suspend fun executeClassDecl(scope: Scope, spec: ClassDeclSpec): Obj {
|
||||||
|
if (spec.isObject) {
|
||||||
|
val parentClasses = spec.baseSpecs.map { baseSpec ->
|
||||||
|
val rec = scope[baseSpec.name] ?: throw ScriptError(spec.startPos, "unknown base class: ${baseSpec.name}")
|
||||||
|
(rec.value as? ObjClass) ?: throw ScriptError(spec.startPos, "${baseSpec.name} is not a class")
|
||||||
|
}
|
||||||
|
|
||||||
|
val newClass = ObjInstanceClass(spec.className, *parentClasses.toTypedArray())
|
||||||
|
newClass.isAnonymous = spec.isAnonymous
|
||||||
|
newClass.constructorMeta = ArgsDeclaration(emptyList(), Token.Type.RPAREN)
|
||||||
|
for (i in parentClasses.indices) {
|
||||||
|
val argsList = spec.baseSpecs[i].args
|
||||||
|
if (argsList != null) newClass.directParentArgs[parentClasses[i]] = argsList
|
||||||
|
}
|
||||||
|
|
||||||
|
val classScope = scope.createChildScope(newThisObj = newClass)
|
||||||
|
classScope.currentClassCtx = newClass
|
||||||
|
newClass.classScope = classScope
|
||||||
|
classScope.addConst("object", newClass)
|
||||||
|
|
||||||
|
spec.bodyInit?.execute(classScope)
|
||||||
|
|
||||||
|
val instance = newClass.callOn(scope.createChildScope(Arguments.EMPTY))
|
||||||
|
if (spec.declaredName != null) {
|
||||||
|
scope.addItem(spec.declaredName, false, instance)
|
||||||
|
}
|
||||||
|
return instance
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.isExtern) {
|
||||||
|
val rec = scope[spec.className]
|
||||||
|
val existing = rec?.value as? ObjClass
|
||||||
|
val resolved = if (existing != null) {
|
||||||
|
existing
|
||||||
|
} else if (spec.className.contains('.')) {
|
||||||
|
scope.resolveQualifiedIdentifier(spec.className) as? ObjClass
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
val stub = resolved ?: ObjInstanceClass(spec.className).apply { this.isAbstract = true }
|
||||||
|
spec.declaredName?.let { scope.addItem(it, false, stub) }
|
||||||
|
return stub
|
||||||
|
}
|
||||||
|
|
||||||
|
val parentClasses = spec.baseSpecs.map { baseSpec ->
|
||||||
|
val rec = scope[baseSpec.name]
|
||||||
|
val cls = rec?.value as? ObjClass
|
||||||
|
if (cls != null) return@map cls
|
||||||
|
if (baseSpec.name == "Exception") return@map ObjException.Root
|
||||||
|
if (rec == null) throw ScriptError(spec.startPos, "unknown base class: ${baseSpec.name}")
|
||||||
|
throw ScriptError(spec.startPos, "${baseSpec.name} is not a class")
|
||||||
|
}
|
||||||
|
|
||||||
|
val constructorCode = object : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val instance = scope.thisObj as ObjInstance
|
||||||
|
return instance
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val newClass = ObjInstanceClass(spec.className, *parentClasses.toTypedArray()).also {
|
||||||
|
it.isAbstract = spec.isAbstract
|
||||||
|
it.instanceConstructor = constructorCode
|
||||||
|
it.constructorMeta = spec.constructorArgs
|
||||||
|
for (i in parentClasses.indices) {
|
||||||
|
val argsList = spec.baseSpecs[i].args
|
||||||
|
if (argsList != null) it.directParentArgs[parentClasses[i]] = argsList
|
||||||
|
}
|
||||||
|
spec.constructorArgs?.params?.forEach { p ->
|
||||||
|
if (p.accessType != null) {
|
||||||
|
it.createField(
|
||||||
|
p.name,
|
||||||
|
ObjNull,
|
||||||
|
isMutable = p.accessType == AccessType.Var,
|
||||||
|
visibility = p.visibility ?: Visibility.Public,
|
||||||
|
declaringClass = it,
|
||||||
|
pos = Pos.builtIn,
|
||||||
|
isTransient = p.isTransient,
|
||||||
|
type = ObjRecord.Type.ConstructorField,
|
||||||
|
fieldId = spec.constructorFieldIds?.get(p.name)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
spec.declaredName?.let { scope.addItem(it, false, newClass) }
|
||||||
|
val classScope = scope.createChildScope(newThisObj = newClass)
|
||||||
|
classScope.currentClassCtx = newClass
|
||||||
|
newClass.classScope = classScope
|
||||||
|
spec.bodyInit?.execute(classScope)
|
||||||
|
if (spec.initScope.isNotEmpty()) {
|
||||||
|
for (s in spec.initScope) {
|
||||||
|
s.execute(classScope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newClass.checkAbstractSatisfaction(spec.startPos)
|
||||||
|
return newClass
|
||||||
|
}
|
||||||
|
|
||||||
|
class ClassDeclStatement(
|
||||||
|
val spec: ClassDeclSpec,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
val declaredName: String? get() = spec.declaredName
|
||||||
|
val typeName: String get() = spec.typeName
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return executeClassDecl(scope, spec)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val target = scope.parent ?: scope
|
||||||
|
return executeClassDecl(target, spec)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -26,12 +26,25 @@ import net.sergeych.lyng.obj.ObjRecord
|
|||||||
* Inherits [Scope.args] and [Scope.thisObj] from [callScope] and adds lookup for symbols
|
* Inherits [Scope.args] and [Scope.thisObj] from [callScope] and adds lookup for symbols
|
||||||
* from [closureScope] with proper precedence
|
* from [closureScope] with proper precedence
|
||||||
*/
|
*/
|
||||||
class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
class ClosureScope(
|
||||||
|
val callScope: Scope,
|
||||||
|
val closureScope: Scope,
|
||||||
|
private val preferredThisType: String? = null
|
||||||
|
) :
|
||||||
// Important: use closureScope.thisObj so unqualified members (e.g., fields) resolve to the instance
|
// Important: use closureScope.thisObj so unqualified members (e.g., fields) resolve to the instance
|
||||||
// we captured, not to the caller's `this` (e.g., FlowBuilder).
|
// we captured, not to the caller's `this` (e.g., FlowBuilder).
|
||||||
Scope(callScope, callScope.args, thisObj = closureScope.thisObj) {
|
Scope(callScope, callScope.args, thisObj = closureScope.thisObj) {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
|
val desired = preferredThisType?.let { typeName ->
|
||||||
|
callScope.thisVariants.firstOrNull { it.objClass.className == typeName }
|
||||||
|
}
|
||||||
|
val primaryThis = closureScope.thisObj
|
||||||
|
val merged = ArrayList<Obj>(callScope.thisVariants.size + closureScope.thisVariants.size + 1)
|
||||||
|
desired?.let { merged.add(it) }
|
||||||
|
merged.addAll(callScope.thisVariants)
|
||||||
|
merged.addAll(closureScope.thisVariants)
|
||||||
|
setThisVariants(primaryThis, merged)
|
||||||
// Preserve the lexical class context of the closure by default. This ensures that lambdas
|
// Preserve the lexical class context of the closure by default. This ensures that lambdas
|
||||||
// created inside a class method keep access to that class's private/protected members even
|
// created inside a class method keep access to that class's private/protected members even
|
||||||
// when executed from within another object's method (e.g., Mutex.withLock), which may set
|
// when executed from within another object's method (e.g., Mutex.withLock), which may set
|
||||||
@@ -54,14 +67,14 @@ class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
|||||||
for (cls in effectiveClass.mro) {
|
for (cls in effectiveClass.mro) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null && !rec.isAbstract) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Finally, root object fallback
|
// Finally, root object fallback
|
||||||
Obj.rootObjectType.members[name]?.let { rec ->
|
Obj.rootObjectType.members[name]?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -71,14 +84,41 @@ class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ApplyScope(_parent: Scope,val applied: Scope) : Scope(_parent, thisObj = applied.thisObj) {
|
/**
|
||||||
|
* Bytecode-oriented closure scope that keeps the call scope parent chain for stack traces
|
||||||
|
* while carrying the lexical closure for `this` variants and module resolution.
|
||||||
|
* Unlike [ClosureScope], it does not override name lookup.
|
||||||
|
*/
|
||||||
|
class BytecodeClosureScope(
|
||||||
|
val callScope: Scope,
|
||||||
|
val closureScope: Scope,
|
||||||
|
private val preferredThisType: String? = null
|
||||||
|
) :
|
||||||
|
Scope(callScope, callScope.args, thisObj = closureScope.thisObj) {
|
||||||
|
|
||||||
|
init {
|
||||||
|
val desired = preferredThisType?.let { typeName ->
|
||||||
|
callScope.thisVariants.firstOrNull { it.objClass.className == typeName }
|
||||||
|
}
|
||||||
|
val primaryThis = closureScope.thisObj
|
||||||
|
val merged = ArrayList<Obj>(callScope.thisVariants.size + closureScope.thisVariants.size + 1)
|
||||||
|
desired?.let { merged.add(it) }
|
||||||
|
merged.addAll(callScope.thisVariants)
|
||||||
|
merged.addAll(closureScope.thisVariants)
|
||||||
|
setThisVariants(primaryThis, merged)
|
||||||
|
this.currentClassCtx = closureScope.currentClassCtx ?: callScope.currentClassCtx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ApplyScope(val callScope: Scope, val applied: Scope) :
|
||||||
|
Scope(callScope, thisObj = applied.thisObj) {
|
||||||
|
|
||||||
override fun get(name: String): ObjRecord? {
|
override fun get(name: String): ObjRecord? {
|
||||||
return applied.get(name) ?: super.get(name)
|
return applied.get(name) ?: super.get(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun applyClosure(closure: Scope): Scope {
|
override fun applyClosure(closure: Scope, preferredThisType: String?): Scope {
|
||||||
return this
|
return ClosureScope(this, closure, preferredThisType)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -19,8 +19,24 @@ package net.sergeych.lyng
|
|||||||
|
|
||||||
sealed class CodeContext {
|
sealed class CodeContext {
|
||||||
class Module(@Suppress("unused") val packageName: String?): CodeContext()
|
class Module(@Suppress("unused") val packageName: String?): CodeContext()
|
||||||
class Function(val name: String): CodeContext()
|
class Function(
|
||||||
|
val name: String,
|
||||||
|
val implicitThisMembers: Boolean = false,
|
||||||
|
val implicitThisTypeName: String? = null,
|
||||||
|
val typeParams: Set<String> = emptySet(),
|
||||||
|
val typeParamDecls: List<TypeDecl.TypeParam> = emptyList()
|
||||||
|
): CodeContext()
|
||||||
class ClassBody(val name: String, val isExtern: Boolean = false): CodeContext() {
|
class ClassBody(val name: String, val isExtern: Boolean = false): CodeContext() {
|
||||||
|
var typeParams: Set<String> = emptySet()
|
||||||
|
var typeParamDecls: List<TypeDecl.TypeParam> = emptyList()
|
||||||
val pendingInitializations = mutableMapOf<String, Pos>()
|
val pendingInitializations = mutableMapOf<String, Pos>()
|
||||||
|
val declaredMembers = mutableSetOf<String>()
|
||||||
|
val classScopeMembers = mutableSetOf<String>()
|
||||||
|
val memberOverrides = mutableMapOf<String, Boolean>()
|
||||||
|
val memberFieldIds = mutableMapOf<String, Int>()
|
||||||
|
val memberMethodIds = mutableMapOf<String, Int>()
|
||||||
|
var nextFieldId: Int = 0
|
||||||
|
var nextMethodId: Int = 0
|
||||||
|
var slotPlanId: Int? = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
|
||||||
|
interface DeclExecutable {
|
||||||
|
suspend fun execute(scope: Scope): Obj
|
||||||
|
}
|
||||||
|
|
||||||
|
class StatementDeclExecutable(private val delegate: Statement) : DeclExecutable {
|
||||||
|
override suspend fun execute(scope: Scope): Obj = delegate.execute(scope)
|
||||||
|
}
|
||||||
@@ -0,0 +1,57 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
|
||||||
|
class DelegatedVarDeclStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val initializer: Statement,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val slotIndex: Int?,
|
||||||
|
val scopeId: Int?,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(context: Scope): Obj {
|
||||||
|
val initValue = initializer.execute(context)
|
||||||
|
val accessTypeStr = if (isMutable) "Var" else "Val"
|
||||||
|
val accessType = ObjString(accessTypeStr)
|
||||||
|
val finalDelegate = try {
|
||||||
|
initValue.invokeInstanceMethod(context, "bind", Arguments(ObjString(name), accessType, ObjNull))
|
||||||
|
} catch (e: Exception) {
|
||||||
|
initValue
|
||||||
|
}
|
||||||
|
val rec = context.addItem(
|
||||||
|
name,
|
||||||
|
isMutable,
|
||||||
|
ObjNull,
|
||||||
|
visibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isTransient = isTransient
|
||||||
|
)
|
||||||
|
rec.delegate = finalDelegate
|
||||||
|
return finalDelegate
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,49 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.ListLiteralRef
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class DestructuringVarDeclStatement(
|
||||||
|
val pattern: ListLiteralRef,
|
||||||
|
val names: List<String>,
|
||||||
|
val initializer: Statement,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(context: Scope): Obj {
|
||||||
|
val value = initializer.execute(context)
|
||||||
|
for (name in names) {
|
||||||
|
context.addItem(name, true, ObjVoid, visibility, isTransient = isTransient)
|
||||||
|
}
|
||||||
|
pattern.setAt(pos, context, value)
|
||||||
|
if (!isMutable) {
|
||||||
|
for (name in names) {
|
||||||
|
val rec = context.objects[name]!!
|
||||||
|
val immutableRec = rec.copy(isMutable = false)
|
||||||
|
context.objects[name] = immutableRec
|
||||||
|
context.localBindings[name] = immutableRec
|
||||||
|
context.updateSlotFor(name, immutableRec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjEnumClass
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
|
class EnumDeclStatement(
|
||||||
|
val declaredName: String,
|
||||||
|
val qualifiedName: String,
|
||||||
|
val entries: List<String>,
|
||||||
|
val lifted: Boolean,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val enumClass = ObjEnumClass.createSimpleEnum(qualifiedName, entries)
|
||||||
|
scope.addItem(declaredName, false, enumClass, recordType = ObjRecord.Type.Enum)
|
||||||
|
if (lifted) {
|
||||||
|
for (entry in entries) {
|
||||||
|
val rec = enumClass.getInstanceMemberOrNull(entry, includeAbstract = false, includeStatic = true)
|
||||||
|
if (rec != null) {
|
||||||
|
scope.addItem(entry, false, rec.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return enumClass
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val target = scope.parent ?: scope
|
||||||
|
return execute(target)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
internal fun extensionCallableName(typeName: String, memberName: String): String {
|
||||||
|
return "__ext__${sanitizeExtensionTypeName(typeName)}__${memberName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun extensionPropertyGetterName(typeName: String, memberName: String): String {
|
||||||
|
return "__ext_get__${sanitizeExtensionTypeName(typeName)}__${memberName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun extensionPropertySetterName(typeName: String, memberName: String): String {
|
||||||
|
return "__ext_set__${sanitizeExtensionTypeName(typeName)}__${memberName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sanitizeExtensionTypeName(typeName: String): String {
|
||||||
|
return typeName.replace('.', '_')
|
||||||
|
}
|
||||||
@@ -0,0 +1,60 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjExtensionPropertyGetterCallable
|
||||||
|
import net.sergeych.lyng.obj.ObjExtensionPropertySetterCallable
|
||||||
|
import net.sergeych.lyng.obj.ObjProperty
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
|
class ExtensionPropertyDeclStatement(
|
||||||
|
val extTypeName: String,
|
||||||
|
val property: ObjProperty,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val setterVisibility: Visibility?,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(context: Scope): Obj {
|
||||||
|
val type = context[extTypeName]?.value ?: context.raiseSymbolNotFound("class $extTypeName not found")
|
||||||
|
if (type !is ObjClass) context.raiseClassCastError("$extTypeName is not the class instance")
|
||||||
|
context.addExtension(
|
||||||
|
type,
|
||||||
|
property.name,
|
||||||
|
ObjRecord(
|
||||||
|
property,
|
||||||
|
isMutable = false,
|
||||||
|
visibility = visibility,
|
||||||
|
writeVisibility = setterVisibility,
|
||||||
|
declaringClass = null,
|
||||||
|
type = ObjRecord.Type.Property
|
||||||
|
)
|
||||||
|
)
|
||||||
|
val getterName = extensionPropertyGetterName(extTypeName, property.name)
|
||||||
|
val getterWrapper = ObjExtensionPropertyGetterCallable(property.name, property)
|
||||||
|
context.addItem(getterName, false, getterWrapper, visibility, recordType = ObjRecord.Type.Fun)
|
||||||
|
if (property.setter != null) {
|
||||||
|
val setterName = extensionPropertySetterName(extTypeName, property.name)
|
||||||
|
val setterWrapper = ObjExtensionPropertySetterCallable(property.name, property)
|
||||||
|
context.addItem(setterName, false, setterWrapper, visibility, recordType = ObjRecord.Type.Fun)
|
||||||
|
}
|
||||||
|
return property
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,70 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.bytecode.SlotType
|
||||||
|
import net.sergeych.lyng.obj.*
|
||||||
|
|
||||||
|
interface FrameAccess {
|
||||||
|
fun getSlotTypeCode(slot: Int): Byte
|
||||||
|
fun getObj(slot: Int): Obj
|
||||||
|
fun getInt(slot: Int): Long
|
||||||
|
fun getReal(slot: Int): Double
|
||||||
|
fun getBool(slot: Int): Boolean
|
||||||
|
fun setObj(slot: Int, value: Obj)
|
||||||
|
fun setInt(slot: Int, value: Long)
|
||||||
|
fun setReal(slot: Int, value: Double)
|
||||||
|
fun setBool(slot: Int, value: Boolean)
|
||||||
|
}
|
||||||
|
|
||||||
|
class FrameSlotRef(
|
||||||
|
private val frame: FrameAccess,
|
||||||
|
private val slot: Int,
|
||||||
|
) : net.sergeych.lyng.obj.Obj() {
|
||||||
|
fun read(): Obj {
|
||||||
|
return when (frame.getSlotTypeCode(slot)) {
|
||||||
|
SlotType.INT.code -> ObjInt.of(frame.getInt(slot))
|
||||||
|
SlotType.REAL.code -> ObjReal.of(frame.getReal(slot))
|
||||||
|
SlotType.BOOL.code -> if (frame.getBool(slot)) ObjTrue else ObjFalse
|
||||||
|
SlotType.OBJ.code -> frame.getObj(slot)
|
||||||
|
else -> ObjNull
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun write(value: Obj) {
|
||||||
|
when (value) {
|
||||||
|
is ObjInt -> frame.setInt(slot, value.value)
|
||||||
|
is ObjReal -> frame.setReal(slot, value.value)
|
||||||
|
is ObjBool -> frame.setBool(slot, value.value)
|
||||||
|
else -> frame.setObj(slot, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class RecordSlotRef(
|
||||||
|
private val record: ObjRecord,
|
||||||
|
) : net.sergeych.lyng.obj.Obj() {
|
||||||
|
fun read(): Obj {
|
||||||
|
val direct = record.value
|
||||||
|
return if (direct is FrameSlotRef) direct.read() else direct
|
||||||
|
}
|
||||||
|
|
||||||
|
fun write(value: Obj) {
|
||||||
|
record.value = value
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,263 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjExtensionMethodCallable
|
||||||
|
import net.sergeych.lyng.obj.ObjInstance
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
import net.sergeych.lyng.obj.ObjUnset
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class FunctionClosureBox(
|
||||||
|
var closure: Scope? = null,
|
||||||
|
var captureContext: Scope? = null,
|
||||||
|
)
|
||||||
|
|
||||||
|
data class FunctionDeclSpec(
|
||||||
|
val name: String,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isStatic: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val isDelegated: Boolean,
|
||||||
|
val delegateExpression: Statement?,
|
||||||
|
val extTypeName: String?,
|
||||||
|
val extensionWrapperName: String?,
|
||||||
|
val memberMethodId: Int?,
|
||||||
|
val actualExtern: Boolean,
|
||||||
|
val parentIsClassBody: Boolean,
|
||||||
|
val externCallSignature: CallSignature?,
|
||||||
|
val annotation: (suspend (Scope, ObjString, Statement) -> Statement)?,
|
||||||
|
val fnBody: Statement,
|
||||||
|
val closureBox: FunctionClosureBox,
|
||||||
|
val captureSlots: List<CaptureSlot>,
|
||||||
|
val startPos: Pos,
|
||||||
|
)
|
||||||
|
|
||||||
|
internal suspend fun executeFunctionDecl(scope: Scope, spec: FunctionDeclSpec): Obj {
|
||||||
|
if (spec.actualExtern && spec.extTypeName == null && !spec.parentIsClassBody) {
|
||||||
|
val existing = scope.get(spec.name)
|
||||||
|
if (existing != null) {
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
existing.value,
|
||||||
|
spec.visibility,
|
||||||
|
callSignature = existing.callSignature
|
||||||
|
)
|
||||||
|
return existing.value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.isDelegated) {
|
||||||
|
val delegateExpr = spec.delegateExpression ?: scope.raiseError("delegated function missing delegate")
|
||||||
|
val accessType = ObjString("Callable")
|
||||||
|
val initValue = delegateExpr.execute(scope)
|
||||||
|
val finalDelegate = try {
|
||||||
|
initValue.invokeInstanceMethod(scope, "bind", Arguments(ObjString(spec.name), accessType, scope.thisObj))
|
||||||
|
} catch (e: Exception) {
|
||||||
|
initValue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.extTypeName != null) {
|
||||||
|
val type = scope[spec.extTypeName]?.value ?: scope.raiseSymbolNotFound("class ${spec.extTypeName} not found")
|
||||||
|
if (type !is ObjClass) scope.raiseClassCastError("${spec.extTypeName} is not the class instance")
|
||||||
|
scope.addExtension(
|
||||||
|
type,
|
||||||
|
spec.name,
|
||||||
|
ObjRecord(ObjUnset, isMutable = false, visibility = spec.visibility, declaringClass = null, type = ObjRecord.Type.Delegated).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
|
||||||
|
val th = scope.thisObj
|
||||||
|
if (spec.isStatic) {
|
||||||
|
(th as ObjClass).createClassField(
|
||||||
|
spec.name,
|
||||||
|
ObjUnset,
|
||||||
|
false,
|
||||||
|
spec.visibility,
|
||||||
|
null,
|
||||||
|
spec.startPos,
|
||||||
|
isTransient = spec.isTransient,
|
||||||
|
type = ObjRecord.Type.Delegated
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
ObjUnset,
|
||||||
|
spec.visibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isTransient = spec.isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
} else if (th is ObjClass) {
|
||||||
|
val cls: ObjClass = th
|
||||||
|
val storageName = "${cls.className}::${spec.name}"
|
||||||
|
cls.createField(
|
||||||
|
spec.name,
|
||||||
|
ObjUnset,
|
||||||
|
false,
|
||||||
|
spec.visibility,
|
||||||
|
null,
|
||||||
|
spec.startPos,
|
||||||
|
declaringClass = cls,
|
||||||
|
isAbstract = spec.isAbstract,
|
||||||
|
isClosed = spec.isClosed,
|
||||||
|
isOverride = spec.isOverride,
|
||||||
|
isTransient = spec.isTransient,
|
||||||
|
type = ObjRecord.Type.Delegated,
|
||||||
|
methodId = spec.memberMethodId
|
||||||
|
)
|
||||||
|
cls.instanceInitializers += object : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
override suspend fun execute(scp: Scope): Obj {
|
||||||
|
val accessType2 = ObjString("Callable")
|
||||||
|
val initValue2 = delegateExpr.execute(scp)
|
||||||
|
val finalDelegate2 = try {
|
||||||
|
initValue2.invokeInstanceMethod(scp, "bind", Arguments(ObjString(spec.name), accessType2, scp.thisObj))
|
||||||
|
} catch (e: Exception) {
|
||||||
|
initValue2
|
||||||
|
}
|
||||||
|
scp.addItem(
|
||||||
|
storageName,
|
||||||
|
false,
|
||||||
|
ObjUnset,
|
||||||
|
spec.visibility,
|
||||||
|
null,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isAbstract = spec.isAbstract,
|
||||||
|
isClosed = spec.isClosed,
|
||||||
|
isOverride = spec.isOverride,
|
||||||
|
isTransient = spec.isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate2
|
||||||
|
}
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
ObjUnset,
|
||||||
|
spec.visibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isTransient = spec.isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.isStatic || !spec.parentIsClassBody) {
|
||||||
|
spec.closureBox.closure = scope
|
||||||
|
}
|
||||||
|
if (spec.parentIsClassBody && spec.captureSlots.isNotEmpty()) {
|
||||||
|
spec.closureBox.captureContext = scope
|
||||||
|
}
|
||||||
|
|
||||||
|
val annotatedFnBody = spec.annotation?.invoke(scope, ObjString(spec.name), spec.fnBody) ?: spec.fnBody
|
||||||
|
val compiledFnBody = annotatedFnBody
|
||||||
|
|
||||||
|
spec.extTypeName?.let { typeName ->
|
||||||
|
val type = scope[typeName]?.value ?: scope.raiseSymbolNotFound("class $typeName not found")
|
||||||
|
if (type !is ObjClass) scope.raiseClassCastError("$typeName is not the class instance")
|
||||||
|
val stmt = object : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val result = (scope.thisObj as? ObjInstance)?.let { i ->
|
||||||
|
val execScope = if (compiledFnBody is net.sergeych.lyng.bytecode.BytecodeStatement) {
|
||||||
|
scope.applyClosureForBytecode(i.instanceScope).also {
|
||||||
|
it.args = scope.args
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
ClosureScope(scope, i.instanceScope)
|
||||||
|
}
|
||||||
|
compiledFnBody.execute(execScope)
|
||||||
|
} ?: compiledFnBody.execute(scope.thisObj.autoInstanceScope(scope))
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
scope.addExtension(type, spec.name, ObjRecord(stmt, isMutable = false, visibility = spec.visibility, declaringClass = null))
|
||||||
|
val wrapperName = spec.extensionWrapperName ?: extensionCallableName(typeName, spec.name)
|
||||||
|
val wrapper = ObjExtensionMethodCallable(spec.name, stmt)
|
||||||
|
scope.addItem(wrapperName, false, wrapper, spec.visibility, recordType = ObjRecord.Type.Fun)
|
||||||
|
} ?: run {
|
||||||
|
val th = scope.thisObj
|
||||||
|
if (!spec.isStatic && th is ObjClass) {
|
||||||
|
val cls: ObjClass = th
|
||||||
|
cls.addFn(
|
||||||
|
spec.name,
|
||||||
|
isMutable = true,
|
||||||
|
visibility = spec.visibility,
|
||||||
|
isAbstract = spec.isAbstract,
|
||||||
|
isClosed = spec.isClosed,
|
||||||
|
isOverride = spec.isOverride,
|
||||||
|
pos = spec.startPos,
|
||||||
|
methodId = spec.memberMethodId
|
||||||
|
) {
|
||||||
|
val savedCtx = this.currentClassCtx
|
||||||
|
this.currentClassCtx = cls
|
||||||
|
try {
|
||||||
|
(thisObj as? ObjInstance)?.let { i ->
|
||||||
|
val execScope = i.instanceScope.createChildScope(
|
||||||
|
pos = this.pos,
|
||||||
|
args = this.args,
|
||||||
|
newThisObj = i
|
||||||
|
)
|
||||||
|
execScope.currentClassCtx = cls
|
||||||
|
compiledFnBody.execute(execScope)
|
||||||
|
} ?: compiledFnBody.execute(thisObj.autoInstanceScope(this))
|
||||||
|
} finally {
|
||||||
|
this.currentClassCtx = savedCtx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
scope.addItem(spec.name, false, compiledFnBody, spec.visibility, callSignature = spec.externCallSignature)
|
||||||
|
compiledFnBody
|
||||||
|
} else {
|
||||||
|
scope.addItem(spec.name, false, compiledFnBody, spec.visibility, callSignature = spec.externCallSignature)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return annotatedFnBody
|
||||||
|
}
|
||||||
|
|
||||||
|
class FunctionDeclStatement(
|
||||||
|
val spec: FunctionDeclSpec,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return executeFunctionDecl(scope, spec)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val target = scope.parent ?: scope
|
||||||
|
return executeFunctionDecl(target, spec)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
sealed class ImportBindingSource {
|
||||||
|
data class Module(val name: String, val pos: Pos) : ImportBindingSource()
|
||||||
|
object Root : ImportBindingSource()
|
||||||
|
object Seed : ImportBindingSource()
|
||||||
|
}
|
||||||
|
|
||||||
|
data class ImportBinding(
|
||||||
|
val symbol: String,
|
||||||
|
val source: ImportBindingSource,
|
||||||
|
)
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class InlineBlockStatement(
|
||||||
|
private val statements: List<Statement>,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
var last: Obj = ObjVoid
|
||||||
|
for (stmt in statements) {
|
||||||
|
last = stmt.execute(scope)
|
||||||
|
}
|
||||||
|
return last
|
||||||
|
}
|
||||||
|
|
||||||
|
fun statements(): List<Statement> = statements
|
||||||
|
}
|
||||||
@@ -33,6 +33,8 @@ class ModuleScope(
|
|||||||
|
|
||||||
constructor(importProvider: ImportProvider, source: Source) : this(importProvider, source.startPos, source.fileName)
|
constructor(importProvider: ImportProvider, source: Source) : this(importProvider, source.startPos, source.fileName)
|
||||||
|
|
||||||
|
internal var importedModules: List<ModuleScope> = emptyList()
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Import symbols into the scope. It _is called_ after the module is imported by [ImportProvider.prepareImport]
|
* Import symbols into the scope. It _is called_ after the module is imported by [ImportProvider.prepareImport]
|
||||||
* which checks symbol availability and accessibility prior to execution.
|
* which checks symbol availability and accessibility prior to execution.
|
||||||
@@ -59,6 +61,7 @@ class ModuleScope(
|
|||||||
// when importing records, we keep track of its package (not otherwise needed)
|
// when importing records, we keep track of its package (not otherwise needed)
|
||||||
if (record.importedFrom == null) record.importedFrom = this
|
if (record.importedFrom == null) record.importedFrom = this
|
||||||
scope.objects[newName] = record
|
scope.objects[newName] = record
|
||||||
|
scope.updateSlotFor(newName, record)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,5 +94,3 @@ class ModuleScope(
|
|||||||
super.get(name)
|
super.get(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -358,6 +358,7 @@ private class Parser(fromPos: Pos) {
|
|||||||
"in" -> Token("in", from, Token.Type.IN)
|
"in" -> Token("in", from, Token.Type.IN)
|
||||||
"is" -> Token("is", from, Token.Type.IS)
|
"is" -> Token("is", from, Token.Type.IS)
|
||||||
"by" -> Token("by", from, Token.Type.BY)
|
"by" -> Token("by", from, Token.Type.BY)
|
||||||
|
"step" -> Token("step", from, Token.Type.STEP)
|
||||||
"object" -> Token("object", from, Token.Type.OBJECT)
|
"object" -> Token("object", from, Token.Type.OBJECT)
|
||||||
"as" -> {
|
"as" -> {
|
||||||
// support both `as` and tight `as?` without spaces
|
// support both `as` and tight `as?` without spaces
|
||||||
@@ -597,4 +598,4 @@ private class Parser(fromPos: Pos) {
|
|||||||
loadToEndOfLine()
|
loadToEndOfLine()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -72,4 +72,5 @@ object PerfFlags {
|
|||||||
|
|
||||||
// Specialized non-allocating integer range iteration in hot loops
|
// Specialized non-allocating integer range iteration in hot loops
|
||||||
var RANGE_FAST_ITER: Boolean = PerfDefaults.RANGE_FAST_ITER
|
var RANGE_FAST_ITER: Boolean = PerfDefaults.RANGE_FAST_ITER
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.bytecode.BytecodeStatement
|
||||||
|
import net.sergeych.lyng.bytecode.CmdDisassembler
|
||||||
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.pacman.ImportProvider
|
import net.sergeych.lyng.pacman.ImportProvider
|
||||||
@@ -50,11 +52,15 @@ open class Scope(
|
|||||||
var currentClassCtx: net.sergeych.lyng.obj.ObjClass? = parent?.currentClassCtx
|
var currentClassCtx: net.sergeych.lyng.obj.ObjClass? = parent?.currentClassCtx
|
||||||
// Unique id per scope frame for PICs; regenerated on each borrow from the pool.
|
// Unique id per scope frame for PICs; regenerated on each borrow from the pool.
|
||||||
var frameId: Long = nextFrameId()
|
var frameId: Long = nextFrameId()
|
||||||
|
@PublishedApi
|
||||||
|
internal val thisVariants: MutableList<Obj> = mutableListOf()
|
||||||
|
|
||||||
// Fast-path storage for local variables/arguments accessed by slot index.
|
// Fast-path storage for local variables/arguments accessed by slot index.
|
||||||
// Enabled by default for child scopes; module/class scopes can ignore it.
|
// Enabled by default for child scopes; module/class scopes can ignore it.
|
||||||
private val slots: MutableList<ObjRecord> = mutableListOf()
|
private val slots: MutableList<ObjRecord> = mutableListOf()
|
||||||
private val nameToSlot: MutableMap<String, Int> = mutableMapOf()
|
private val nameToSlot: MutableMap<String, Int> = mutableMapOf()
|
||||||
|
internal var captureRecords: List<ObjRecord>? = null
|
||||||
|
internal var captureNames: List<String>? = null
|
||||||
/**
|
/**
|
||||||
* Auxiliary per-frame map of local bindings (locals declared in this frame).
|
* Auxiliary per-frame map of local bindings (locals declared in this frame).
|
||||||
* This helps resolving locals across suspension when slot ownership isn't
|
* This helps resolving locals across suspension when slot ownership isn't
|
||||||
@@ -64,6 +70,21 @@ open class Scope(
|
|||||||
|
|
||||||
internal val extensions: MutableMap<ObjClass, MutableMap<String, ObjRecord>> = mutableMapOf()
|
internal val extensions: MutableMap<ObjClass, MutableMap<String, ObjRecord>> = mutableMapOf()
|
||||||
|
|
||||||
|
init {
|
||||||
|
setThisVariants(thisObj, parent?.thisVariants ?: emptyList())
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun setThisVariants(primary: Obj, extras: List<Obj>) {
|
||||||
|
thisObj = primary
|
||||||
|
thisVariants.clear()
|
||||||
|
thisVariants.add(primary)
|
||||||
|
for (obj in extras) {
|
||||||
|
if (obj !== primary && !thisVariants.contains(obj)) {
|
||||||
|
thisVariants.add(obj)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun addExtension(cls: ObjClass, name: String, record: ObjRecord) {
|
fun addExtension(cls: ObjClass, name: String, record: ObjRecord) {
|
||||||
extensions.getOrPut(cls) { mutableMapOf() }[name] = record
|
extensions.getOrPut(cls) { mutableMapOf() }[name] = record
|
||||||
}
|
}
|
||||||
@@ -112,7 +133,7 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.objects[name]?.let { rec ->
|
s.objects[name]?.let { rec ->
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
caller?.let { ctx ->
|
caller?.let { ctx ->
|
||||||
s.localBindings[ctx.mangledName(name)]?.let { rec ->
|
s.localBindings[ctx.mangledName(name)]?.let { rec ->
|
||||||
@@ -120,11 +141,19 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.localBindings[name]?.let { rec ->
|
s.localBindings[name]?.let { rec ->
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
s.getSlotIndexOf(name)?.let { idx ->
|
s.getSlotIndexOf(name)?.let { idx ->
|
||||||
val rec = s.getSlotRecord(idx)
|
val rec = s.getSlotRecord(idx)
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
val hasDirectBinding =
|
||||||
|
s.objects.containsKey(name) ||
|
||||||
|
s.localBindings.containsKey(name) ||
|
||||||
|
(caller?.let { ctx ->
|
||||||
|
s.objects.containsKey(ctx.mangledName(name)) ||
|
||||||
|
s.localBindings.containsKey(ctx.mangledName(name))
|
||||||
|
} ?: false)
|
||||||
|
if (!hasDirectBinding && rec.value === ObjUnset) return null
|
||||||
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -141,6 +170,13 @@ open class Scope(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal fun resolveCaptureRecord(name: String): ObjRecord? {
|
||||||
|
if (captureRecords != null) {
|
||||||
|
raiseIllegalState("resolveCaptureRecord is interpreter-only; bytecode captures use captureRecords")
|
||||||
|
}
|
||||||
|
return chainLookupIgnoreClosure(name, followClosure = true, caller = currentClassCtx)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Perform base Scope.get semantics for this frame without delegating into parent.get
|
* Perform base Scope.get semantics for this frame without delegating into parent.get
|
||||||
* virtual dispatch. This checks:
|
* virtual dispatch. This checks:
|
||||||
@@ -163,7 +199,7 @@ open class Scope(
|
|||||||
this.extensions[cls]?.get(name)?.let { return it }
|
this.extensions[cls]?.get(name)?.let { return it }
|
||||||
}
|
}
|
||||||
return thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
return thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx, name)) {
|
||||||
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
|
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
|
||||||
else rec
|
else rec
|
||||||
} else null
|
} else null
|
||||||
@@ -186,7 +222,7 @@ open class Scope(
|
|||||||
s.extensions[cls]?.get(name)?.let { return it }
|
s.extensions[cls]?.get(name)?.let { return it }
|
||||||
}
|
}
|
||||||
s.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
s.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, caller)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, caller, name)) {
|
||||||
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) {
|
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) {
|
||||||
// ignore fields, properties and abstracts here, they will be handled by the caller via readField
|
// ignore fields, properties and abstracts here, they will be handled by the caller via readField
|
||||||
} else return rec
|
} else return rec
|
||||||
@@ -326,19 +362,25 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
|
|
||||||
inline fun <reified T : Obj> thisAs(): T {
|
inline fun <reified T : Obj> thisAs(): T {
|
||||||
var s: Scope? = this
|
for (obj in thisVariants) {
|
||||||
while (s != null) {
|
if (obj is T) return obj
|
||||||
val t = s.thisObj
|
|
||||||
if (t is T) return t
|
|
||||||
s = s.parent
|
|
||||||
}
|
}
|
||||||
raiseClassCastError("Cannot cast ${thisObj.objClass.className} to ${T::class.simpleName}")
|
raiseClassCastError("Cannot cast ${thisObj.objClass.className} to ${T::class.simpleName}")
|
||||||
}
|
}
|
||||||
|
|
||||||
internal val objects = mutableMapOf<String, ObjRecord>()
|
internal val objects = mutableMapOf<String, ObjRecord>()
|
||||||
|
|
||||||
|
internal fun getLocalRecordDirect(name: String): ObjRecord? = objects[name]
|
||||||
|
|
||||||
open operator fun get(name: String): ObjRecord? {
|
open operator fun get(name: String): ObjRecord? {
|
||||||
if (name == "this") return thisObj.asReadonly
|
if (name == "this") return thisObj.asReadonly
|
||||||
|
if (name == "__PACKAGE__") {
|
||||||
|
var s: Scope? = this
|
||||||
|
while (s != null) {
|
||||||
|
if (s is ModuleScope) return s.packageNameObj
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 1. Prefer direct locals/bindings declared in this frame
|
// 1. Prefer direct locals/bindings declared in this frame
|
||||||
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
||||||
@@ -358,14 +400,14 @@ open class Scope(
|
|||||||
for (cls in effectiveClass.mro) {
|
for (cls in effectiveClass.mro) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null && !rec.isAbstract) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Finally, root object fallback
|
// Finally, root object fallback
|
||||||
Obj.rootObjectType.members[name]?.let { rec ->
|
Obj.rootObjectType.members[name]?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -377,10 +419,20 @@ open class Scope(
|
|||||||
// Slot fast-path API
|
// Slot fast-path API
|
||||||
fun getSlotRecord(index: Int): ObjRecord = slots[index]
|
fun getSlotRecord(index: Int): ObjRecord = slots[index]
|
||||||
fun setSlotValue(index: Int, newValue: Obj) {
|
fun setSlotValue(index: Int, newValue: Obj) {
|
||||||
slots[index].value = newValue
|
val record = slots[index]
|
||||||
|
val value = record.value
|
||||||
|
if (value is FrameSlotRef) {
|
||||||
|
value.write(newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
record.value = newValue
|
||||||
}
|
}
|
||||||
|
val slotCount: Int
|
||||||
|
get() = slots.size
|
||||||
|
|
||||||
fun getSlotIndexOf(name: String): Int? = nameToSlot[name]
|
fun getSlotIndexOf(name: String): Int? = nameToSlot[name]
|
||||||
|
|
||||||
|
internal fun slotNameToIndexSnapshot(): Map<String, Int> = nameToSlot.toMap()
|
||||||
fun allocateSlotFor(name: String, record: ObjRecord): Int {
|
fun allocateSlotFor(name: String, record: ObjRecord): Int {
|
||||||
val idx = slots.size
|
val idx = slots.size
|
||||||
slots.add(record)
|
slots.add(record)
|
||||||
@@ -390,6 +442,90 @@ open class Scope(
|
|||||||
|
|
||||||
fun updateSlotFor(name: String, record: ObjRecord) {
|
fun updateSlotFor(name: String, record: ObjRecord) {
|
||||||
nameToSlot[name]?.let { slots[it] = record }
|
nameToSlot[name]?.let { slots[it] = record }
|
||||||
|
if (objects[name] == null) {
|
||||||
|
objects[name] = record
|
||||||
|
}
|
||||||
|
if (localBindings[name] == null) {
|
||||||
|
localBindings[name] = record
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply a precomputed slot plan (name -> slot index) for this scope.
|
||||||
|
* This enables direct slot references to bypass name-based lookup.
|
||||||
|
*/
|
||||||
|
fun applySlotPlan(plan: Map<String, Int>) {
|
||||||
|
if (plan.isEmpty()) return
|
||||||
|
val maxIndex = plan.values.maxOrNull() ?: return
|
||||||
|
if (slots.size <= maxIndex) {
|
||||||
|
val targetSize = maxIndex + 1
|
||||||
|
while (slots.size < targetSize) {
|
||||||
|
slots.add(ObjRecord(ObjUnset, isMutable = true))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for ((name, idx) in plan) {
|
||||||
|
nameToSlot[name] = idx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun applySlotPlanReset(plan: Map<String, Int>, records: Map<String, ObjRecord>) {
|
||||||
|
if (plan.isEmpty()) return
|
||||||
|
slots.clear()
|
||||||
|
nameToSlot.clear()
|
||||||
|
val maxIndex = plan.values.maxOrNull() ?: return
|
||||||
|
val targetSize = maxIndex + 1
|
||||||
|
repeat(targetSize) {
|
||||||
|
slots.add(ObjRecord(ObjUnset, isMutable = true))
|
||||||
|
}
|
||||||
|
for ((name, idx) in plan) {
|
||||||
|
nameToSlot[name] = idx
|
||||||
|
val record = records[name]
|
||||||
|
if (record != null && record.value !== ObjUnset) {
|
||||||
|
slots[idx] = record
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun applySlotPlanWithSnapshot(plan: Map<String, Int>): Map<String, Int?> {
|
||||||
|
if (plan.isEmpty()) return emptyMap()
|
||||||
|
val maxIndex = plan.values.maxOrNull() ?: return emptyMap()
|
||||||
|
if (slots.size <= maxIndex) {
|
||||||
|
val targetSize = maxIndex + 1
|
||||||
|
while (slots.size < targetSize) {
|
||||||
|
slots.add(ObjRecord(ObjUnset, isMutable = true))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val snapshot = LinkedHashMap<String, Int?>(plan.size)
|
||||||
|
for ((name, idx) in plan) {
|
||||||
|
snapshot[name] = nameToSlot[name]
|
||||||
|
nameToSlot[name] = idx
|
||||||
|
}
|
||||||
|
return snapshot
|
||||||
|
}
|
||||||
|
|
||||||
|
fun restoreSlotPlan(snapshot: Map<String, Int?>) {
|
||||||
|
if (snapshot.isEmpty()) return
|
||||||
|
for ((name, idx) in snapshot) {
|
||||||
|
if (idx == null) {
|
||||||
|
nameToSlot.remove(name)
|
||||||
|
} else {
|
||||||
|
nameToSlot[name] = idx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hasSlotPlanConflict(plan: Map<String, Int>): Boolean {
|
||||||
|
if (plan.isEmpty() || nameToSlot.isEmpty()) return false
|
||||||
|
val planIndexToNames = HashMap<Int, HashSet<String>>(plan.size)
|
||||||
|
for ((name, idx) in plan) {
|
||||||
|
val names = planIndexToNames.getOrPut(idx) { HashSet(2) }
|
||||||
|
names.add(name)
|
||||||
|
}
|
||||||
|
for ((existingName, existingIndex) in nameToSlot) {
|
||||||
|
val plannedNames = planIndexToNames[existingIndex] ?: continue
|
||||||
|
if (!plannedNames.contains(existingName)) return true
|
||||||
|
}
|
||||||
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -399,6 +535,7 @@ open class Scope(
|
|||||||
this.parent = null
|
this.parent = null
|
||||||
this.skipScopeCreation = false
|
this.skipScopeCreation = false
|
||||||
this.currentClassCtx = null
|
this.currentClassCtx = null
|
||||||
|
thisVariants.clear()
|
||||||
objects.clear()
|
objects.clear()
|
||||||
slots.clear()
|
slots.clear()
|
||||||
nameToSlot.clear()
|
nameToSlot.clear()
|
||||||
@@ -429,7 +566,7 @@ open class Scope(
|
|||||||
this.parent = parent
|
this.parent = parent
|
||||||
this.args = args
|
this.args = args
|
||||||
this.pos = pos
|
this.pos = pos
|
||||||
this.thisObj = thisObj
|
setThisVariants(thisObj, parent?.thisVariants ?: emptyList())
|
||||||
// Pre-size local slots for upcoming parameter assignment where possible
|
// Pre-size local slots for upcoming parameter assignment where possible
|
||||||
reserveLocalCapacity(args.list.size + 4)
|
reserveLocalCapacity(args.list.size + 4)
|
||||||
}
|
}
|
||||||
@@ -503,6 +640,7 @@ open class Scope(
|
|||||||
if (this is ClosureScope) {
|
if (this is ClosureScope) {
|
||||||
callScope.localBindings[name] = it
|
callScope.localBindings[name] = it
|
||||||
}
|
}
|
||||||
|
bumpClassLayoutIfNeeded(name, value, recordType)
|
||||||
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)
|
||||||
|
|
||||||
@@ -516,7 +654,11 @@ open class Scope(
|
|||||||
declaringClass: net.sergeych.lyng.obj.ObjClass? = currentClassCtx,
|
declaringClass: net.sergeych.lyng.obj.ObjClass? = currentClassCtx,
|
||||||
isAbstract: Boolean = false,
|
isAbstract: Boolean = false,
|
||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false
|
isOverride: Boolean = false,
|
||||||
|
isTransient: Boolean = false,
|
||||||
|
callSignature: CallSignature? = null,
|
||||||
|
fieldId: Int? = null,
|
||||||
|
methodId: Int? = null
|
||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
val rec = ObjRecord(
|
val rec = ObjRecord(
|
||||||
value, isMutable, visibility, writeVisibility,
|
value, isMutable, visibility, writeVisibility,
|
||||||
@@ -524,9 +666,32 @@ open class Scope(
|
|||||||
type = recordType,
|
type = recordType,
|
||||||
isAbstract = isAbstract,
|
isAbstract = isAbstract,
|
||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride
|
isOverride = isOverride,
|
||||||
|
isTransient = isTransient,
|
||||||
|
callSignature = callSignature,
|
||||||
|
memberName = name,
|
||||||
|
fieldId = fieldId,
|
||||||
|
methodId = methodId
|
||||||
)
|
)
|
||||||
objects[name] = rec
|
objects[name] = rec
|
||||||
|
bumpClassLayoutIfNeeded(name, value, recordType)
|
||||||
|
if (recordType == ObjRecord.Type.Field || recordType == ObjRecord.Type.ConstructorField) {
|
||||||
|
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
||||||
|
if (inst != null) {
|
||||||
|
val slotId = rec.fieldId ?: inst.objClass.fieldSlotForKey(name)?.slot
|
||||||
|
if (slotId != null) inst.setFieldSlotRecord(slotId, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (value is Statement ||
|
||||||
|
recordType == ObjRecord.Type.Fun ||
|
||||||
|
recordType == ObjRecord.Type.Delegated ||
|
||||||
|
recordType == ObjRecord.Type.Property) {
|
||||||
|
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
||||||
|
if (inst != null) {
|
||||||
|
val slotId = rec.methodId ?: inst.objClass.methodSlotForKey(name)?.slot
|
||||||
|
if (slotId != null) inst.setMethodSlotRecord(slotId, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
// Index this binding within the current frame to help resolve locals across suspension
|
// Index this binding within the current frame to help resolve locals across suspension
|
||||||
localBindings[name] = rec
|
localBindings[name] = rec
|
||||||
// If we are a ClosureScope, mirror binding into the caller frame to keep it discoverable
|
// If we are a ClosureScope, mirror binding into the caller frame to keep it discoverable
|
||||||
@@ -556,6 +721,14 @@ open class Scope(
|
|||||||
return rec
|
return rec
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun bumpClassLayoutIfNeeded(name: String, value: Obj, recordType: ObjRecord.Type) {
|
||||||
|
val cls = thisObj as? net.sergeych.lyng.obj.ObjClass ?: return
|
||||||
|
if (cls.classScope !== this) return
|
||||||
|
if (!(value is Statement || recordType == ObjRecord.Type.Fun || recordType == ObjRecord.Type.Delegated)) return
|
||||||
|
if (cls.members.containsKey(name)) return
|
||||||
|
cls.layoutVersion += 1
|
||||||
|
}
|
||||||
|
|
||||||
fun getOrCreateNamespace(name: String): ObjClass {
|
fun getOrCreateNamespace(name: String): ObjClass {
|
||||||
val ns = objects.getOrPut(name) { ObjRecord(ObjNamespace(name), isMutable = false) }.value
|
val ns = objects.getOrPut(name) { ObjRecord(ObjNamespace(name), isMutable = false) }.value
|
||||||
return ns.objClass
|
return ns.objClass
|
||||||
@@ -568,7 +741,16 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun addFn(vararg names: String, fn: suspend Scope.() -> Obj) {
|
fun disassembleSymbol(name: String): String {
|
||||||
|
val record = get(name) ?: return "$name is not found"
|
||||||
|
val stmt = record.value as? Statement ?: return "$name is not a compiled body"
|
||||||
|
val bytecode = (stmt as? BytecodeStatement)?.bytecodeFunction()
|
||||||
|
?: (stmt as? BytecodeBodyProvider)?.bytecodeBody()?.bytecodeFunction()
|
||||||
|
?: return "$name is not a compiled body"
|
||||||
|
return CmdDisassembler.disassemble(bytecode)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun addFn(vararg names: String, callSignature: CallSignature? = null, fn: suspend Scope.() -> Obj) {
|
||||||
val newFn = object : Statement() {
|
val newFn = object : Statement() {
|
||||||
override val pos: Pos = Pos.builtIn
|
override val pos: Pos = Pos.builtIn
|
||||||
|
|
||||||
@@ -579,7 +761,9 @@ open class Scope(
|
|||||||
addItem(
|
addItem(
|
||||||
name,
|
name,
|
||||||
false,
|
false,
|
||||||
newFn
|
newFn,
|
||||||
|
recordType = ObjRecord.Type.Fun,
|
||||||
|
callSignature = callSignature
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -593,9 +777,10 @@ open class Scope(
|
|||||||
eval(code.toSource())
|
eval(code.toSource())
|
||||||
|
|
||||||
suspend fun eval(source: Source): Obj {
|
suspend fun eval(source: Source): Obj {
|
||||||
return Compiler.compile(
|
return Compiler.compileWithResolution(
|
||||||
source,
|
source,
|
||||||
currentImportProvider
|
currentImportProvider,
|
||||||
|
seedScope = this
|
||||||
).execute(this)
|
).execute(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -648,7 +833,12 @@ open class Scope(
|
|||||||
println("--------------------")
|
println("--------------------")
|
||||||
}
|
}
|
||||||
|
|
||||||
open fun applyClosure(closure: Scope): Scope = ClosureScope(this, closure)
|
open fun applyClosure(closure: Scope, preferredThisType: String? = null): Scope =
|
||||||
|
ClosureScope(this, closure, preferredThisType)
|
||||||
|
|
||||||
|
internal fun applyClosureForBytecode(closure: Scope, preferredThisType: String? = null): Scope {
|
||||||
|
return BytecodeClosureScope(this, closure, preferredThisType)
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Resolve and evaluate a qualified identifier exactly as compiled code would.
|
* Resolve and evaluate a qualified identifier exactly as compiled code would.
|
||||||
@@ -660,19 +850,43 @@ open class Scope(
|
|||||||
val trimmed = qualifiedName.trim()
|
val trimmed = qualifiedName.trim()
|
||||||
if (trimmed.isEmpty()) raiseSymbolNotFound("empty identifier")
|
if (trimmed.isEmpty()) raiseSymbolNotFound("empty identifier")
|
||||||
val parts = trimmed.split('.')
|
val parts = trimmed.split('.')
|
||||||
var ref: ObjRef = LocalVarRef(parts[0], Pos.builtIn)
|
val first = parts[0]
|
||||||
for (i in 1 until parts.size) {
|
val ref: ObjRef = if (first == "this") {
|
||||||
ref = FieldRef(ref, parts[i], false)
|
ConstRef(thisObj.asReadonly)
|
||||||
|
} else {
|
||||||
|
var s: Scope? = this
|
||||||
|
var slot: Int? = null
|
||||||
|
var guard = 0
|
||||||
|
while (s != null && guard++ < 1024 && slot == null) {
|
||||||
|
slot = s.getSlotIndexOf(first)
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
if (slot == null) raiseSymbolNotFound(first)
|
||||||
|
LocalSlotRef(first, slot, 0, isMutable = false, isDelegated = false, Pos.builtIn, strict = true)
|
||||||
}
|
}
|
||||||
return ref.evalValue(this)
|
var ref0: ObjRef = ref
|
||||||
|
for (i in 1 until parts.size) {
|
||||||
|
ref0 = FieldRef(ref0, parts[i], false)
|
||||||
|
}
|
||||||
|
return ref0.evalValue(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun resolve(rec: ObjRecord, name: String): Obj {
|
suspend fun resolve(rec: ObjRecord, name: String): Obj {
|
||||||
|
val value = rec.value
|
||||||
|
if (value is FrameSlotRef) {
|
||||||
|
return value.read()
|
||||||
|
}
|
||||||
val receiver = rec.receiver ?: thisObj
|
val receiver = rec.receiver ?: thisObj
|
||||||
return receiver.resolveRecord(this, rec, name, rec.declaringClass).value
|
return receiver.resolveRecord(this, rec, name, rec.declaringClass).value
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun assign(rec: ObjRecord, name: String, newValue: Obj) {
|
suspend fun assign(rec: ObjRecord, name: String, newValue: Obj) {
|
||||||
|
val value = rec.value
|
||||||
|
if (value is FrameSlotRef) {
|
||||||
|
if (!rec.isMutable && value.read() !== ObjUnset) raiseIllegalAssignment("can't reassign val $name")
|
||||||
|
value.write(newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
if (rec.type == ObjRecord.Type.Delegated) {
|
||||||
val receiver = rec.receiver ?: thisObj
|
val receiver = rec.receiver ?: thisObj
|
||||||
val del = rec.delegate ?: run {
|
val del = rec.delegate ?: run {
|
||||||
|
|||||||
@@ -20,10 +20,9 @@ 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.miniast.addConstDoc
|
import net.sergeych.lyng.bytecode.CmdFunction
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
import net.sergeych.lyng.bytecode.CmdVm
|
||||||
import net.sergeych.lyng.miniast.addVoidFnDoc
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.miniast.type
|
|
||||||
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.rootLyng
|
import net.sergeych.lyng.stdlib_included.rootLyng
|
||||||
@@ -35,10 +34,58 @@ import kotlin.math.*
|
|||||||
class Script(
|
class Script(
|
||||||
override val pos: Pos,
|
override val pos: Pos,
|
||||||
private val statements: List<Statement> = emptyList(),
|
private val statements: List<Statement> = emptyList(),
|
||||||
|
private val moduleSlotPlan: Map<String, Int> = emptyMap(),
|
||||||
|
private val importBindings: Map<String, ImportBinding> = emptyMap(),
|
||||||
|
private val importedModules: List<ImportBindingSource.Module> = emptyList(),
|
||||||
|
private val moduleBytecode: CmdFunction? = null,
|
||||||
// private val catchReturn: Boolean = false,
|
// private val catchReturn: Boolean = false,
|
||||||
) : Statement() {
|
) : Statement() {
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
scope.pos = pos
|
||||||
|
val isModuleScope = scope is ModuleScope
|
||||||
|
val shouldSeedModule = isModuleScope || scope.thisObj === ObjVoid
|
||||||
|
val moduleTarget = scope
|
||||||
|
if (moduleSlotPlan.isNotEmpty() && shouldSeedModule) {
|
||||||
|
val hasPlanMapping = moduleSlotPlan.keys.any { moduleTarget.getSlotIndexOf(it) != null }
|
||||||
|
val needsReset = moduleTarget is ModuleScope ||
|
||||||
|
moduleTarget.slotCount() == 0 ||
|
||||||
|
moduleTarget.hasSlotPlanConflict(moduleSlotPlan) ||
|
||||||
|
(!hasPlanMapping && moduleTarget.slotCount() > 0)
|
||||||
|
if (needsReset) {
|
||||||
|
val preserved = LinkedHashMap<String, ObjRecord>()
|
||||||
|
for (name in moduleSlotPlan.keys) {
|
||||||
|
moduleTarget.getLocalRecordDirect(name)?.let { preserved[name] = it }
|
||||||
|
}
|
||||||
|
moduleTarget.applySlotPlanReset(moduleSlotPlan, preserved)
|
||||||
|
for (name in moduleSlotPlan.keys) {
|
||||||
|
if (preserved.containsKey(name)) continue
|
||||||
|
val inherited = findSeedRecord(moduleTarget.parent, name)
|
||||||
|
if (inherited != null && inherited.value !== ObjUnset) {
|
||||||
|
moduleTarget.updateSlotFor(name, inherited)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
moduleTarget.applySlotPlan(moduleSlotPlan)
|
||||||
|
for (name in moduleSlotPlan.keys) {
|
||||||
|
val local = moduleTarget.getLocalRecordDirect(name)
|
||||||
|
if (local != null && local.value !== ObjUnset) {
|
||||||
|
moduleTarget.updateSlotFor(name, local)
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val inherited = findSeedRecord(moduleTarget.parent, name)
|
||||||
|
if (inherited != null && inherited.value !== ObjUnset) {
|
||||||
|
moduleTarget.updateSlotFor(name, inherited)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (shouldSeedModule) {
|
||||||
|
seedModuleSlots(moduleTarget)
|
||||||
|
}
|
||||||
|
moduleBytecode?.let { fn ->
|
||||||
|
return CmdVm().execute(fn, scope, scope.args)
|
||||||
|
}
|
||||||
var lastResult: Obj = ObjVoid
|
var lastResult: Obj = ObjVoid
|
||||||
for (s in statements) {
|
for (s in statements) {
|
||||||
lastResult = s.execute(scope)
|
lastResult = s.execute(scope)
|
||||||
@@ -46,6 +93,80 @@ class Script(
|
|||||||
return lastResult
|
return lastResult
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private suspend fun seedModuleSlots(scope: Scope) {
|
||||||
|
if (importBindings.isEmpty() && importedModules.isEmpty()) return
|
||||||
|
seedImportBindings(scope)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun seedImportBindings(scope: Scope) {
|
||||||
|
val provider = scope.currentImportProvider
|
||||||
|
val importedModules = LinkedHashSet<ModuleScope>()
|
||||||
|
for (moduleRef in this.importedModules) {
|
||||||
|
importedModules.add(provider.prepareImport(moduleRef.pos, moduleRef.name, null))
|
||||||
|
}
|
||||||
|
if (scope is ModuleScope) {
|
||||||
|
scope.importedModules = importedModules.toList()
|
||||||
|
}
|
||||||
|
for ((name, binding) in importBindings) {
|
||||||
|
val record = when (val source = binding.source) {
|
||||||
|
is ImportBindingSource.Module -> {
|
||||||
|
val module = provider.prepareImport(source.pos, source.name, null)
|
||||||
|
importedModules.add(module)
|
||||||
|
module.objects[binding.symbol]?.takeIf { it.visibility.isPublic }
|
||||||
|
?: scope.raiseSymbolNotFound("symbol ${source.name}.${binding.symbol} not found")
|
||||||
|
}
|
||||||
|
ImportBindingSource.Root -> {
|
||||||
|
provider.rootScope.objects[binding.symbol]?.takeIf { it.visibility.isPublic }
|
||||||
|
?: scope.raiseSymbolNotFound("symbol ${binding.symbol} not found")
|
||||||
|
}
|
||||||
|
ImportBindingSource.Seed -> {
|
||||||
|
findSeedRecord(scope, binding.symbol)
|
||||||
|
?: scope.raiseSymbolNotFound("symbol ${binding.symbol} not found")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (name == "Exception" && record.value !is ObjClass) {
|
||||||
|
scope.updateSlotFor(name, ObjRecord(ObjException.Root, isMutable = false))
|
||||||
|
} else {
|
||||||
|
scope.updateSlotFor(name, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for (module in importedModules) {
|
||||||
|
for ((cls, map) in module.extensions) {
|
||||||
|
for ((symbol, record) in map) {
|
||||||
|
if (record.visibility.isPublic) {
|
||||||
|
scope.addExtension(cls, symbol, record)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun findSeedRecord(scope: Scope?, name: String): ObjRecord? {
|
||||||
|
var s = scope
|
||||||
|
var hops = 0
|
||||||
|
while (s != null && hops++ < 1024) {
|
||||||
|
s.objects[name]?.let { return it }
|
||||||
|
s.localBindings[name]?.let { return it }
|
||||||
|
s.getSlotIndexOf(name)?.let { idx ->
|
||||||
|
val rec = s.getSlotRecord(idx)
|
||||||
|
if (rec.value !== ObjUnset) return rec
|
||||||
|
}
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun resolveModuleScope(scope: Scope): ModuleScope? {
|
||||||
|
var current: Scope? = scope
|
||||||
|
while (current != null) {
|
||||||
|
if (current is ModuleScope) return current
|
||||||
|
current = current.parent
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun debugStatements(): List<Statement> = statements
|
||||||
|
|
||||||
suspend fun execute() = execute(
|
suspend fun execute() = execute(
|
||||||
defaultImportManager.newStdScope()
|
defaultImportManager.newStdScope()
|
||||||
)
|
)
|
||||||
@@ -77,6 +198,16 @@ class Script(
|
|||||||
println()
|
println()
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
addFn("call") {
|
||||||
|
val callee = args.list.firstOrNull()
|
||||||
|
?: raiseError("call requires a callable as the first argument")
|
||||||
|
val rest = if (args.list.size > 1) {
|
||||||
|
Arguments(args.list.drop(1))
|
||||||
|
} else {
|
||||||
|
Arguments.EMPTY
|
||||||
|
}
|
||||||
|
callee.callOn(createChildScope(pos, args = rest))
|
||||||
|
}
|
||||||
addFn("floor") {
|
addFn("floor") {
|
||||||
val x = args.firstAndOnly()
|
val x = args.firstAndOnly()
|
||||||
(if (x is ObjInt) x
|
(if (x is ObjInt) x
|
||||||
@@ -162,6 +293,42 @@ class Script(
|
|||||||
if (x is ObjInt) ObjInt(x.value.absoluteValue) else ObjReal(x.toDouble().absoluteValue)
|
if (x is ObjInt) ObjInt(x.value.absoluteValue) else ObjReal(x.toDouble().absoluteValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
"clamp",
|
||||||
|
doc = "Clamps the value within the specified range. If the value is outside the range, it is set to the nearest boundary. Respects inclusive/exclusive range ends.",
|
||||||
|
params = listOf(ParamDoc("value"), ParamDoc("range")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
val value = requiredArg<Obj>(0)
|
||||||
|
val range = requiredArg<ObjRange>(1)
|
||||||
|
|
||||||
|
var result = value
|
||||||
|
if (range.start != null && !range.start.isNull) {
|
||||||
|
if (result.compareTo(this, range.start) < 0) {
|
||||||
|
result = range.start
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (range.end != null && !range.end.isNull) {
|
||||||
|
val cmp = range.end.compareTo(this, result)
|
||||||
|
if (range.isEndInclusive) {
|
||||||
|
if (cmp < 0) result = range.end
|
||||||
|
} else {
|
||||||
|
if (cmp <= 0) {
|
||||||
|
if (range.end is ObjInt) {
|
||||||
|
result = ObjInt.of(range.end.value - 1)
|
||||||
|
} else if (range.end is ObjChar) {
|
||||||
|
result = ObjChar((range.end.value.code - 1).toChar())
|
||||||
|
} else {
|
||||||
|
// For types where we can't easily find "previous" value (like Real),
|
||||||
|
// we just return the exclusive boundary as a fallback.
|
||||||
|
result = range.end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
addVoidFn("assert") {
|
addVoidFn("assert") {
|
||||||
val cond = requiredArg<ObjBool>(0)
|
val cond = requiredArg<ObjBool>(0)
|
||||||
val message = if (args.size > 1)
|
val message = if (args.size > 1)
|
||||||
@@ -256,7 +423,7 @@ class Script(
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
addFn("dynamic") {
|
addFn("dynamic", callSignature = CallSignature(tailBlockReceiverType = "DelegateContext")) {
|
||||||
ObjDynamic.create(this, requireOnlyArg())
|
ObjDynamic.create(this, requireOnlyArg())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -292,7 +459,30 @@ class Script(
|
|||||||
this.trace(args.getOrNull(0)?.toString() ?: "")
|
this.trace(args.getOrNull(0)?.toString() ?: "")
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
addFn("run") {
|
||||||
|
requireOnlyArg<Statement>().execute(this)
|
||||||
|
}
|
||||||
|
addFn("cached") {
|
||||||
|
val builder = requireOnlyArg<Statement>()
|
||||||
|
val capturedScope = this
|
||||||
|
var calculated = false
|
||||||
|
var cachedValue: Obj = ObjVoid
|
||||||
|
val thunk = object : Statement() {
|
||||||
|
override val pos: Pos = Pos.builtIn
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
if (!calculated) {
|
||||||
|
cachedValue = builder.execute(capturedScope)
|
||||||
|
calculated = true
|
||||||
|
}
|
||||||
|
return cachedValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
thunk
|
||||||
|
}
|
||||||
|
addFn("lazy") {
|
||||||
|
val builder = requireOnlyArg<Statement>()
|
||||||
|
ObjLazyDelegate(builder, this)
|
||||||
|
}
|
||||||
addVoidFn("delay") {
|
addVoidFn("delay") {
|
||||||
val a = args.firstAndOnly()
|
val a = args.firstAndOnly()
|
||||||
when (a) {
|
when (a) {
|
||||||
@@ -319,6 +509,7 @@ class Script(
|
|||||||
// interfaces
|
// interfaces
|
||||||
addConst("Iterable", ObjIterable)
|
addConst("Iterable", ObjIterable)
|
||||||
addConst("Collection", ObjCollection)
|
addConst("Collection", ObjCollection)
|
||||||
|
addConst("Iterator", ObjIterator)
|
||||||
addConst("Array", ObjArray)
|
addConst("Array", ObjArray)
|
||||||
addConst("RingBuffer", ObjRingBuffer.type)
|
addConst("RingBuffer", ObjRingBuffer.type)
|
||||||
addConst("Class", ObjClassType)
|
addConst("Class", ObjClassType)
|
||||||
@@ -327,8 +518,13 @@ class Script(
|
|||||||
addConst("CompletableDeferred", ObjCompletableDeferred.type)
|
addConst("CompletableDeferred", ObjCompletableDeferred.type)
|
||||||
addConst("Mutex", ObjMutex.type)
|
addConst("Mutex", ObjMutex.type)
|
||||||
addConst("Flow", ObjFlow.type)
|
addConst("Flow", ObjFlow.type)
|
||||||
|
addConst("FlowBuilder", ObjFlowBuilder.type)
|
||||||
|
addConst("Delegate", ObjDynamic.type)
|
||||||
|
addConst("DelegateContext", ObjDynamicContext.type)
|
||||||
|
|
||||||
addConst("Regex", ObjRegex.type)
|
addConst("Regex", ObjRegex.type)
|
||||||
|
addConst("RegexMatch", ObjRegexMatch.type)
|
||||||
|
addConst("MapEntry", ObjMapEntry.type)
|
||||||
|
|
||||||
addFn("launch") {
|
addFn("launch") {
|
||||||
val callable = requireOnlyArg<Statement>()
|
val callable = requireOnlyArg<Statement>()
|
||||||
@@ -342,7 +538,7 @@ class Script(
|
|||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
|
||||||
addFn("flow") {
|
addFn("flow", callSignature = CallSignature(tailBlockReceiverType = "FlowBuilder")) {
|
||||||
// important is: current context contains closure often used in call;
|
// important is: current context contains closure often used in call;
|
||||||
// we'll need it for the producer
|
// we'll need it for the producer
|
||||||
ObjFlow(requireOnlyArg<Statement>(), this)
|
ObjFlow(requireOnlyArg<Statement>(), this)
|
||||||
@@ -399,6 +595,12 @@ class Script(
|
|||||||
doc = "Point in time (epoch-based).",
|
doc = "Point in time (epoch-based).",
|
||||||
type = type("lyng.Class")
|
type = type("lyng.Class")
|
||||||
)
|
)
|
||||||
|
it.addConstDoc(
|
||||||
|
name = "DateTime",
|
||||||
|
value = ObjDateTime.type,
|
||||||
|
doc = "Point in time in a specific time zone.",
|
||||||
|
type = type("lyng.Class")
|
||||||
|
)
|
||||||
it.addConstDoc(
|
it.addConstDoc(
|
||||||
name = "Duration",
|
name = "Duration",
|
||||||
value = ObjDuration.type,
|
value = ObjDuration.type,
|
||||||
@@ -423,4 +625,4 @@ class Script(
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -36,7 +36,7 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
|
|||||||
PLUS, MINUS, STAR, SLASH, PERCENT,
|
PLUS, MINUS, STAR, SLASH, PERCENT,
|
||||||
ASSIGN, PLUSASSIGN, MINUSASSIGN, STARASSIGN, SLASHASSIGN, PERCENTASSIGN, IFNULLASSIGN,
|
ASSIGN, PLUSASSIGN, MINUSASSIGN, STARASSIGN, SLASHASSIGN, PERCENTASSIGN, IFNULLASSIGN,
|
||||||
PLUS2, MINUS2,
|
PLUS2, MINUS2,
|
||||||
IN, NOTIN, IS, NOTIS, BY,
|
IN, NOTIN, IS, NOTIS, BY, STEP,
|
||||||
EQ, NEQ, LT, LTE, GT, GTE, REF_EQ, REF_NEQ, MATCH, NOTMATCH,
|
EQ, NEQ, LT, LTE, GT, GTE, REF_EQ, REF_NEQ, MATCH, NOTMATCH,
|
||||||
SHUTTLE,
|
SHUTTLE,
|
||||||
AND, BITAND, OR, BITOR, BITXOR, NOT, BITNOT, DOT, ARROW, EQARROW, QUESTION, COLONCOLON,
|
AND, BITAND, OR, BITOR, BITXOR, NOT, BITNOT, DOT, ARROW, EQARROW, QUESTION, COLONCOLON,
|
||||||
@@ -59,4 +59,4 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
|
|||||||
companion object {
|
companion object {
|
||||||
// fun eof(parser: Parser) = Token("", parser.currentPos, Type.EOF)
|
// fun eof(parser: Parser) = Token("", parser.currentPos, Type.EOF)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,87 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjException
|
||||||
|
import net.sergeych.lyng.obj.ObjUnknownException
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class TryStatement(
|
||||||
|
val body: Statement,
|
||||||
|
val catches: List<CatchBlock>,
|
||||||
|
val finallyClause: Statement?,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
data class CatchBlock(
|
||||||
|
val catchVarName: String,
|
||||||
|
val catchVarPos: Pos,
|
||||||
|
val classNames: List<String>,
|
||||||
|
val block: Statement
|
||||||
|
)
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
var result: Obj = ObjVoid
|
||||||
|
try {
|
||||||
|
result = body.execute(scope)
|
||||||
|
} catch (e: ReturnException) {
|
||||||
|
throw e
|
||||||
|
} catch (e: LoopBreakContinueException) {
|
||||||
|
throw e
|
||||||
|
} catch (e: Exception) {
|
||||||
|
val caughtObj = when (e) {
|
||||||
|
is ExecutionError -> e.errorObject
|
||||||
|
else -> ObjUnknownException(scope, e.message ?: e.toString())
|
||||||
|
}
|
||||||
|
var isCaught = false
|
||||||
|
for (cdata in catches) {
|
||||||
|
var match: Obj? = null
|
||||||
|
for (exceptionClassName in cdata.classNames) {
|
||||||
|
val exObj = resolveExceptionClass(scope, exceptionClassName)
|
||||||
|
if (caughtObj.isInstanceOf(exObj)) {
|
||||||
|
match = caughtObj
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (match != null) {
|
||||||
|
val catchContext = scope.createChildScope(pos = cdata.catchVarPos).apply {
|
||||||
|
skipScopeCreation = true
|
||||||
|
}
|
||||||
|
catchContext.addItem(cdata.catchVarName, false, caughtObj)
|
||||||
|
result = cdata.block.execute(catchContext)
|
||||||
|
isCaught = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!isCaught) throw e
|
||||||
|
} finally {
|
||||||
|
finallyClause?.execute(scope)
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun resolveExceptionClass(scope: Scope, name: String): ObjClass {
|
||||||
|
val rec = scope[name]
|
||||||
|
val cls = rec?.value as? ObjClass
|
||||||
|
if (cls != null) return cls
|
||||||
|
if (name == "Exception") return ObjException.Root
|
||||||
|
scope.raiseSymbolNotFound("error class does not exist or is not a class: $name")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -22,8 +22,23 @@ package net.sergeych.lyng
|
|||||||
// this is highly experimental and subject to complete redesign
|
// this is highly experimental and subject to complete redesign
|
||||||
// very soon
|
// very soon
|
||||||
sealed class TypeDecl(val isNullable:Boolean = false) {
|
sealed class TypeDecl(val isNullable:Boolean = false) {
|
||||||
|
enum class Variance { In, Out, Invariant }
|
||||||
// ??
|
// ??
|
||||||
// data class Fn(val argTypes: List<ArgsDeclaration.Item>, val retType: TypeDecl) : TypeDecl()
|
data class Function(
|
||||||
|
val receiver: TypeDecl?,
|
||||||
|
val params: List<TypeDecl>,
|
||||||
|
val returnType: TypeDecl,
|
||||||
|
val nullable: Boolean = false
|
||||||
|
) : TypeDecl(nullable)
|
||||||
|
data class TypeVar(val name: String, val nullable: Boolean = false) : TypeDecl(nullable)
|
||||||
|
data class Union(val options: List<TypeDecl>, val nullable: Boolean = false) : TypeDecl(nullable)
|
||||||
|
data class Intersection(val options: List<TypeDecl>, val nullable: Boolean = false) : TypeDecl(nullable)
|
||||||
|
data class TypeParam(
|
||||||
|
val name: String,
|
||||||
|
val variance: Variance = Variance.Invariant,
|
||||||
|
val bound: TypeDecl? = null,
|
||||||
|
val defaultType: TypeDecl? = null
|
||||||
|
)
|
||||||
object TypeAny : TypeDecl()
|
object TypeAny : TypeDecl()
|
||||||
object TypeNullableAny : TypeDecl(true)
|
object TypeNullableAny : TypeDecl(true)
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,50 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjUnset
|
||||||
|
|
||||||
|
class VarDeclStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val initializer: Statement?,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val slotIndex: Int?,
|
||||||
|
val scopeId: Int?,
|
||||||
|
private val startPos: Pos,
|
||||||
|
val initializerObjClass: ObjClass? = null,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(context: Scope): Obj {
|
||||||
|
val initValue = initializer?.execute(context)?.byValueCopy() ?: ObjUnset
|
||||||
|
context.addItem(
|
||||||
|
name,
|
||||||
|
isMutable,
|
||||||
|
initValue,
|
||||||
|
visibility,
|
||||||
|
recordType = ObjRecord.Type.Other,
|
||||||
|
isTransient = isTransient
|
||||||
|
)
|
||||||
|
return initValue
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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.
|
||||||
@@ -25,7 +25,12 @@ enum class Visibility {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** MI-aware visibility check: whether [caller] can access a member declared in [decl] with [visibility]. */
|
/** MI-aware visibility check: whether [caller] can access a member declared in [decl] with [visibility]. */
|
||||||
fun canAccessMember(visibility: Visibility, decl: net.sergeych.lyng.obj.ObjClass?, caller: net.sergeych.lyng.obj.ObjClass?): Boolean {
|
fun canAccessMember(
|
||||||
|
visibility: Visibility,
|
||||||
|
decl: net.sergeych.lyng.obj.ObjClass?,
|
||||||
|
caller: net.sergeych.lyng.obj.ObjClass?,
|
||||||
|
name: String? = null
|
||||||
|
): Boolean {
|
||||||
val res = when (visibility) {
|
val res = when (visibility) {
|
||||||
Visibility.Public -> true
|
Visibility.Public -> true
|
||||||
Visibility.Private -> (decl != null && caller === decl)
|
Visibility.Private -> (decl != null && caller === decl)
|
||||||
@@ -33,7 +38,14 @@ fun canAccessMember(visibility: Visibility, decl: net.sergeych.lyng.obj.ObjClass
|
|||||||
decl == null -> false
|
decl == null -> false
|
||||||
caller == null -> false
|
caller == null -> false
|
||||||
caller === decl -> true
|
caller === decl -> true
|
||||||
else -> (caller.allParentsSet.contains(decl))
|
caller.allParentsSet.contains(decl) -> true
|
||||||
|
name != null && decl.allParentsSet.contains(caller) -> {
|
||||||
|
// Ancestor can access protected member of its descendant if it also has this member
|
||||||
|
// (i.e. it's an override of something the ancestor knows about)
|
||||||
|
val existing = caller.getInstanceMemberOrNull(name, includeAbstract = true)
|
||||||
|
existing != null && (existing.visibility == Visibility.Protected || existing.visibility == Visibility.Public)
|
||||||
|
}
|
||||||
|
else -> false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
|
|||||||
@@ -0,0 +1,80 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
sealed class WhenCondition(open val expr: Statement, open val pos: Pos) {
|
||||||
|
abstract suspend fun matches(scope: Scope, value: Obj): Boolean
|
||||||
|
}
|
||||||
|
|
||||||
|
class WhenEqualsCondition(
|
||||||
|
override val expr: Statement,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : WhenCondition(expr, pos) {
|
||||||
|
override suspend fun matches(scope: Scope, value: Obj): Boolean {
|
||||||
|
return expr.execute(scope).compareTo(scope, value) == 0
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class WhenInCondition(
|
||||||
|
override val expr: Statement,
|
||||||
|
val negated: Boolean,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : WhenCondition(expr, pos) {
|
||||||
|
override suspend fun matches(scope: Scope, value: Obj): Boolean {
|
||||||
|
val result = expr.execute(scope).contains(scope, value)
|
||||||
|
return if (negated) !result else result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class WhenIsCondition(
|
||||||
|
override val expr: Statement,
|
||||||
|
val negated: Boolean,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : WhenCondition(expr, pos) {
|
||||||
|
override suspend fun matches(scope: Scope, value: Obj): Boolean {
|
||||||
|
val typeExpr = expr.execute(scope)
|
||||||
|
val result = when (typeExpr) {
|
||||||
|
is net.sergeych.lyng.obj.ObjTypeExpr -> net.sergeych.lyng.obj.matchesTypeDecl(scope, value, typeExpr.typeDecl)
|
||||||
|
else -> value.isInstanceOf(typeExpr)
|
||||||
|
}
|
||||||
|
return if (negated) !result else result
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
data class WhenCase(val conditions: List<WhenCondition>, val block: Statement)
|
||||||
|
|
||||||
|
class WhenStatement(
|
||||||
|
val value: Statement,
|
||||||
|
val cases: List<WhenCase>,
|
||||||
|
val elseCase: Statement?,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val whenValue = value.execute(scope)
|
||||||
|
for (case in cases) {
|
||||||
|
for (condition in case.conditions) {
|
||||||
|
if (condition.matches(scope, whenValue)) {
|
||||||
|
return case.block.execute(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return elseCase?.execute(scope) ?: ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -27,7 +27,7 @@ import net.sergeych.lyng.highlight.SimpleLyngHighlighter
|
|||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
|
|
||||||
enum class SymbolKind { Class, Enum, Function, Value, Variable, Parameter }
|
enum class SymbolKind { Class, Enum, TypeAlias, Function, Value, Variable, Parameter }
|
||||||
|
|
||||||
data class Symbol(
|
data class Symbol(
|
||||||
val id: Int,
|
val id: Int,
|
||||||
@@ -126,13 +126,22 @@ object Binder {
|
|||||||
}
|
}
|
||||||
// Members (including fields and methods)
|
// Members (including fields and methods)
|
||||||
for (m in d.members) {
|
for (m in d.members) {
|
||||||
if (m is MiniMemberValDecl) {
|
when (m) {
|
||||||
val fs = source.offsetOf(m.nameStart)
|
is MiniMemberValDecl -> {
|
||||||
val fe = fs + m.name.length
|
val fs = source.offsetOf(m.nameStart)
|
||||||
val kind = if (m.mutable) SymbolKind.Variable else SymbolKind.Value
|
val fe = fs + m.name.length
|
||||||
val fieldSym = Symbol(nextId++, m.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(m.type))
|
val kind = if (m.mutable) SymbolKind.Variable else SymbolKind.Value
|
||||||
symbols += fieldSym
|
val fieldSym = Symbol(nextId++, m.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(m.type))
|
||||||
classScope.fields += fieldSym.id
|
symbols += fieldSym
|
||||||
|
classScope.fields += fieldSym.id
|
||||||
|
}
|
||||||
|
is MiniMemberTypeAliasDecl -> {
|
||||||
|
val fs = source.offsetOf(m.nameStart)
|
||||||
|
val fe = fs + m.name.length
|
||||||
|
val aliasSym = Symbol(nextId++, m.name, SymbolKind.TypeAlias, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(m.target))
|
||||||
|
symbols += aliasSym
|
||||||
|
}
|
||||||
|
else -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -197,6 +206,12 @@ object Binder {
|
|||||||
symbols += sym
|
symbols += sym
|
||||||
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
||||||
}
|
}
|
||||||
|
is MiniTypeAliasDecl -> {
|
||||||
|
val (s, e) = nameOffsets(d.nameStart, d.name)
|
||||||
|
val sym = Symbol(nextId++, d.name, SymbolKind.TypeAlias, s, e, containerId = null, type = DocLookupUtils.typeOf(d.target))
|
||||||
|
symbols += sym
|
||||||
|
topLevelByName.getOrPut(d.name) { mutableListOf() }.add(sym.id)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.Pos
|
||||||
|
|
||||||
|
class BytecodeCompileException(
|
||||||
|
message: String,
|
||||||
|
val pos: Pos? = null,
|
||||||
|
) : RuntimeException(message) {
|
||||||
|
override fun toString(): String =
|
||||||
|
pos?.let { "${super.toString()} at $it" } ?: super.toString()
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,92 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.ArgsDeclaration
|
||||||
|
import net.sergeych.lyng.Pos
|
||||||
|
import net.sergeych.lyng.Visibility
|
||||||
|
import net.sergeych.lyng.obj.ListLiteralRef
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjProperty
|
||||||
|
|
||||||
|
sealed class BytecodeConst {
|
||||||
|
object Null : BytecodeConst()
|
||||||
|
data class Bool(val value: Boolean) : BytecodeConst()
|
||||||
|
data class IntVal(val value: Long) : BytecodeConst()
|
||||||
|
data class RealVal(val value: Double) : BytecodeConst()
|
||||||
|
data class StringVal(val value: String) : BytecodeConst()
|
||||||
|
data class PosVal(val pos: Pos) : BytecodeConst()
|
||||||
|
data class ObjRef(val value: Obj) : BytecodeConst()
|
||||||
|
data class ListLiteralPlan(val spreads: List<Boolean>) : BytecodeConst()
|
||||||
|
data class LambdaFn(
|
||||||
|
val fn: CmdFunction,
|
||||||
|
val captureTableId: Int?,
|
||||||
|
val captureNames: List<String>,
|
||||||
|
val paramSlotPlan: Map<String, Int>,
|
||||||
|
val argsDeclaration: ArgsDeclaration?,
|
||||||
|
val preferredThisType: String?,
|
||||||
|
val wrapAsExtensionCallable: Boolean,
|
||||||
|
val returnLabels: Set<String>,
|
||||||
|
val pos: Pos,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class EnumDecl(
|
||||||
|
val declaredName: String,
|
||||||
|
val qualifiedName: String,
|
||||||
|
val entries: List<String>,
|
||||||
|
val lifted: Boolean,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class FunctionDecl(
|
||||||
|
val spec: net.sergeych.lyng.FunctionDeclSpec,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class ClassDecl(
|
||||||
|
val spec: net.sergeych.lyng.ClassDeclSpec,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class SlotPlan(val plan: Map<String, Int>, val captures: List<String> = emptyList()) : BytecodeConst()
|
||||||
|
data class CaptureTable(val entries: List<BytecodeCaptureEntry>) : BytecodeConst()
|
||||||
|
data class ExtensionPropertyDecl(
|
||||||
|
val extTypeName: String,
|
||||||
|
val property: ObjProperty,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val setterVisibility: Visibility?,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class LocalDecl(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class DelegatedDecl(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class DestructureDecl(
|
||||||
|
val pattern: ListLiteralRef,
|
||||||
|
val names: List<String>,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val pos: Pos,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class DestructureAssign(
|
||||||
|
val pattern: ListLiteralRef,
|
||||||
|
val pos: Pos,
|
||||||
|
) : BytecodeConst()
|
||||||
|
data class CallArgsPlan(val tailBlock: Boolean, val specs: List<CallArgSpec>) : BytecodeConst()
|
||||||
|
data class CallArgSpec(val name: String?, val isSplat: Boolean)
|
||||||
|
}
|
||||||
@@ -0,0 +1,88 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.FrameAccess
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
|
||||||
|
class BytecodeFrame(
|
||||||
|
val localCount: Int,
|
||||||
|
val argCount: Int,
|
||||||
|
) : FrameAccess {
|
||||||
|
val slotCount: Int = localCount + argCount
|
||||||
|
val argBase: Int = localCount
|
||||||
|
|
||||||
|
private val slotTypes: ByteArray = ByteArray(slotCount) { SlotType.UNKNOWN.code }
|
||||||
|
private val objSlots: Array<Obj?> = arrayOfNulls(slotCount)
|
||||||
|
private val intSlots: LongArray = LongArray(slotCount)
|
||||||
|
private val realSlots: DoubleArray = DoubleArray(slotCount)
|
||||||
|
private val boolSlots: BooleanArray = BooleanArray(slotCount)
|
||||||
|
|
||||||
|
fun getSlotType(slot: Int): SlotType = SlotType.values().first { it.code == slotTypes[slot] }
|
||||||
|
override fun getSlotTypeCode(slot: Int): Byte = slotTypes[slot]
|
||||||
|
fun setSlotType(slot: Int, type: SlotType) {
|
||||||
|
slotTypes[slot] = type.code
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getObj(slot: Int): Obj {
|
||||||
|
val value = objSlots[slot] ?: return ObjNull
|
||||||
|
return when (value) {
|
||||||
|
is net.sergeych.lyng.FrameSlotRef -> value.read()
|
||||||
|
is net.sergeych.lyng.RecordSlotRef -> value.read()
|
||||||
|
else -> value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun getRawObj(slot: Int): Obj? = objSlots[slot]
|
||||||
|
|
||||||
|
override fun setObj(slot: Int, value: Obj) {
|
||||||
|
when (val current = objSlots[slot]) {
|
||||||
|
is net.sergeych.lyng.FrameSlotRef -> current.write(value)
|
||||||
|
is net.sergeych.lyng.RecordSlotRef -> current.write(value)
|
||||||
|
else -> objSlots[slot] = value
|
||||||
|
}
|
||||||
|
slotTypes[slot] = SlotType.OBJ.code
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getInt(slot: Int): Long = intSlots[slot]
|
||||||
|
override fun setInt(slot: Int, value: Long) {
|
||||||
|
intSlots[slot] = value
|
||||||
|
slotTypes[slot] = SlotType.INT.code
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getReal(slot: Int): Double = realSlots[slot]
|
||||||
|
override fun setReal(slot: Int, value: Double) {
|
||||||
|
realSlots[slot] = value
|
||||||
|
slotTypes[slot] = SlotType.REAL.code
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun getBool(slot: Int): Boolean = boolSlots[slot]
|
||||||
|
override fun setBool(slot: Int, value: Boolean) {
|
||||||
|
boolSlots[slot] = value
|
||||||
|
slotTypes[slot] = SlotType.BOOL.code
|
||||||
|
}
|
||||||
|
|
||||||
|
fun clearSlot(slot: Int) {
|
||||||
|
slotTypes[slot] = SlotType.UNKNOWN.code
|
||||||
|
objSlots[slot] = null
|
||||||
|
intSlots[slot] = 0L
|
||||||
|
realSlots[slot] = 0.0
|
||||||
|
boolSlots[slot] = false
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,281 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
import net.sergeych.lyng.*
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ValueFnRef
|
||||||
|
|
||||||
|
class BytecodeStatement private constructor(
|
||||||
|
val original: Statement,
|
||||||
|
private val function: CmdFunction,
|
||||||
|
) : Statement(original.isStaticConst, original.isConst, original.returnType) {
|
||||||
|
override val pos: Pos = original.pos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
scope.pos = pos
|
||||||
|
return CmdVm().execute(function, scope, scope.args)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun bytecodeFunction(): CmdFunction = function
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
fun wrap(
|
||||||
|
statement: Statement,
|
||||||
|
nameHint: String,
|
||||||
|
allowLocalSlots: Boolean,
|
||||||
|
returnLabels: Set<String> = emptySet(),
|
||||||
|
rangeLocalNames: Set<String> = emptySet(),
|
||||||
|
allowedScopeNames: Set<String>? = null,
|
||||||
|
moduleScopeId: Int? = null,
|
||||||
|
forcedLocalSlots: Map<String, Int> = emptyMap(),
|
||||||
|
forcedLocalScopeId: Int? = null,
|
||||||
|
slotTypeByScopeId: Map<Int, Map<Int, ObjClass>> = emptyMap(),
|
||||||
|
knownNameObjClass: Map<String, ObjClass> = emptyMap(),
|
||||||
|
knownObjectNames: Set<String> = emptySet(),
|
||||||
|
classFieldTypesByName: Map<String, Map<String, ObjClass>> = emptyMap(),
|
||||||
|
enumEntriesByName: Map<String, List<String>> = emptyMap(),
|
||||||
|
callableReturnTypeByScopeId: Map<Int, Map<Int, ObjClass>> = emptyMap(),
|
||||||
|
callableReturnTypeByName: Map<String, ObjClass> = emptyMap(),
|
||||||
|
lambdaCaptureEntriesByRef: Map<ValueFnRef, List<LambdaCaptureEntry>> = emptyMap(),
|
||||||
|
): Statement {
|
||||||
|
if (statement is BytecodeStatement) return statement
|
||||||
|
val hasUnsupported = containsUnsupportedStatement(statement)
|
||||||
|
if (hasUnsupported) {
|
||||||
|
val statementName = statement.toString()
|
||||||
|
throw BytecodeCompileException(
|
||||||
|
"Bytecode compile error: unsupported statement $statementName in '$nameHint'",
|
||||||
|
statement.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
val safeLocals = allowLocalSlots
|
||||||
|
val compiler = BytecodeCompiler(
|
||||||
|
allowLocalSlots = safeLocals,
|
||||||
|
returnLabels = returnLabels,
|
||||||
|
rangeLocalNames = rangeLocalNames,
|
||||||
|
allowedScopeNames = allowedScopeNames,
|
||||||
|
moduleScopeId = moduleScopeId,
|
||||||
|
forcedLocalSlots = forcedLocalSlots,
|
||||||
|
forcedLocalScopeId = forcedLocalScopeId,
|
||||||
|
slotTypeByScopeId = slotTypeByScopeId,
|
||||||
|
knownNameObjClass = knownNameObjClass,
|
||||||
|
knownObjectNames = knownObjectNames,
|
||||||
|
classFieldTypesByName = classFieldTypesByName,
|
||||||
|
enumEntriesByName = enumEntriesByName,
|
||||||
|
callableReturnTypeByScopeId = callableReturnTypeByScopeId,
|
||||||
|
callableReturnTypeByName = callableReturnTypeByName,
|
||||||
|
lambdaCaptureEntriesByRef = lambdaCaptureEntriesByRef
|
||||||
|
)
|
||||||
|
val compiled = compiler.compileStatement(nameHint, statement)
|
||||||
|
val fn = compiled ?: throw BytecodeCompileException(
|
||||||
|
"Bytecode compile error: failed to compile '$nameHint'",
|
||||||
|
statement.pos
|
||||||
|
)
|
||||||
|
return BytecodeStatement(statement, fn)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun containsUnsupportedStatement(stmt: Statement): Boolean {
|
||||||
|
val target = if (stmt is BytecodeStatement) stmt.original else stmt
|
||||||
|
return when (target) {
|
||||||
|
is net.sergeych.lyng.ExpressionStatement -> {
|
||||||
|
val ref = target.ref
|
||||||
|
if (ref is net.sergeych.lyng.obj.StatementRef) {
|
||||||
|
containsUnsupportedStatement(ref.statement)
|
||||||
|
} else {
|
||||||
|
false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.IfStatement -> {
|
||||||
|
containsUnsupportedStatement(target.condition) ||
|
||||||
|
containsUnsupportedStatement(target.ifBody) ||
|
||||||
|
(target.elseBody?.let { containsUnsupportedStatement(it) } ?: false)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.ForInStatement -> {
|
||||||
|
val unsupported = containsUnsupportedStatement(target.source) ||
|
||||||
|
containsUnsupportedStatement(target.body) ||
|
||||||
|
(target.elseStatement?.let { containsUnsupportedStatement(it) } ?: false)
|
||||||
|
unsupported
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.WhileStatement -> {
|
||||||
|
containsUnsupportedStatement(target.condition) ||
|
||||||
|
containsUnsupportedStatement(target.body) ||
|
||||||
|
(target.elseStatement?.let { containsUnsupportedStatement(it) } ?: false)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.DoWhileStatement -> {
|
||||||
|
containsUnsupportedStatement(target.body) ||
|
||||||
|
containsUnsupportedStatement(target.condition) ||
|
||||||
|
(target.elseStatement?.let { containsUnsupportedStatement(it) } ?: false)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.BlockStatement ->
|
||||||
|
target.statements().any { containsUnsupportedStatement(it) }
|
||||||
|
is net.sergeych.lyng.InlineBlockStatement ->
|
||||||
|
target.statements().any { containsUnsupportedStatement(it) }
|
||||||
|
is net.sergeych.lyng.VarDeclStatement ->
|
||||||
|
target.initializer?.let { containsUnsupportedStatement(it) } ?: false
|
||||||
|
is net.sergeych.lyng.DelegatedVarDeclStatement ->
|
||||||
|
containsUnsupportedStatement(target.initializer)
|
||||||
|
is net.sergeych.lyng.DestructuringVarDeclStatement ->
|
||||||
|
containsUnsupportedStatement(target.initializer)
|
||||||
|
is net.sergeych.lyng.BreakStatement ->
|
||||||
|
target.resultExpr?.let { containsUnsupportedStatement(it) } ?: false
|
||||||
|
is net.sergeych.lyng.ContinueStatement -> false
|
||||||
|
is net.sergeych.lyng.ReturnStatement ->
|
||||||
|
target.resultExpr?.let { containsUnsupportedStatement(it) } ?: false
|
||||||
|
is net.sergeych.lyng.ThrowStatement ->
|
||||||
|
containsUnsupportedStatement(target.throwExpr)
|
||||||
|
is net.sergeych.lyng.NopStatement -> false
|
||||||
|
is net.sergeych.lyng.ExtensionPropertyDeclStatement -> false
|
||||||
|
is net.sergeych.lyng.ClassDeclStatement -> false
|
||||||
|
is net.sergeych.lyng.FunctionDeclStatement -> false
|
||||||
|
is net.sergeych.lyng.EnumDeclStatement -> false
|
||||||
|
is net.sergeych.lyng.TryStatement -> {
|
||||||
|
containsUnsupportedStatement(target.body) ||
|
||||||
|
target.catches.any { containsUnsupportedStatement(it.block) } ||
|
||||||
|
(target.finallyClause?.let { containsUnsupportedStatement(it) } ?: false)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.WhenStatement -> {
|
||||||
|
containsUnsupportedStatement(target.value) ||
|
||||||
|
target.cases.any { case ->
|
||||||
|
case.conditions.any { cond -> containsUnsupportedStatement(cond.expr) } ||
|
||||||
|
containsUnsupportedStatement(case.block)
|
||||||
|
} ||
|
||||||
|
(target.elseCase?.let { containsUnsupportedStatement(it) } ?: false)
|
||||||
|
}
|
||||||
|
else -> true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun unwrapDeep(stmt: Statement): Statement {
|
||||||
|
return when (stmt) {
|
||||||
|
is BytecodeStatement -> unwrapDeep(stmt.original)
|
||||||
|
is net.sergeych.lyng.BlockStatement -> {
|
||||||
|
val unwrapped = stmt.statements().map { unwrapDeep(it) }
|
||||||
|
net.sergeych.lyng.BlockStatement(
|
||||||
|
net.sergeych.lyng.Script(stmt.pos, unwrapped),
|
||||||
|
stmt.slotPlan,
|
||||||
|
stmt.scopeId,
|
||||||
|
stmt.captureSlots,
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.VarDeclStatement -> {
|
||||||
|
net.sergeych.lyng.VarDeclStatement(
|
||||||
|
stmt.name,
|
||||||
|
stmt.isMutable,
|
||||||
|
stmt.visibility,
|
||||||
|
stmt.initializer?.let { unwrapDeep(it) },
|
||||||
|
stmt.isTransient,
|
||||||
|
stmt.slotIndex,
|
||||||
|
stmt.scopeId,
|
||||||
|
stmt.pos,
|
||||||
|
stmt.initializerObjClass
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.DestructuringVarDeclStatement -> {
|
||||||
|
net.sergeych.lyng.DestructuringVarDeclStatement(
|
||||||
|
stmt.pattern,
|
||||||
|
stmt.names,
|
||||||
|
unwrapDeep(stmt.initializer),
|
||||||
|
stmt.isMutable,
|
||||||
|
stmt.visibility,
|
||||||
|
stmt.isTransient,
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.IfStatement -> {
|
||||||
|
net.sergeych.lyng.IfStatement(
|
||||||
|
unwrapDeep(stmt.condition),
|
||||||
|
unwrapDeep(stmt.ifBody),
|
||||||
|
stmt.elseBody?.let { unwrapDeep(it) },
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.ForInStatement -> {
|
||||||
|
net.sergeych.lyng.ForInStatement(
|
||||||
|
stmt.loopVarName,
|
||||||
|
unwrapDeep(stmt.source),
|
||||||
|
stmt.constRange,
|
||||||
|
unwrapDeep(stmt.body),
|
||||||
|
stmt.elseStatement?.let { unwrapDeep(it) },
|
||||||
|
stmt.label,
|
||||||
|
stmt.canBreak,
|
||||||
|
stmt.loopSlotPlan,
|
||||||
|
stmt.loopScopeId,
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.WhileStatement -> {
|
||||||
|
net.sergeych.lyng.WhileStatement(
|
||||||
|
unwrapDeep(stmt.condition),
|
||||||
|
unwrapDeep(stmt.body),
|
||||||
|
stmt.elseStatement?.let { unwrapDeep(it) },
|
||||||
|
stmt.label,
|
||||||
|
stmt.canBreak,
|
||||||
|
stmt.loopSlotPlan,
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.DoWhileStatement -> {
|
||||||
|
net.sergeych.lyng.DoWhileStatement(
|
||||||
|
unwrapDeep(stmt.body),
|
||||||
|
unwrapDeep(stmt.condition),
|
||||||
|
stmt.elseStatement?.let { unwrapDeep(it) },
|
||||||
|
stmt.label,
|
||||||
|
stmt.loopSlotPlan,
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.BreakStatement -> {
|
||||||
|
val resultExpr = stmt.resultExpr?.let { unwrapDeep(it) }
|
||||||
|
net.sergeych.lyng.BreakStatement(stmt.label, resultExpr, stmt.pos)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.ContinueStatement ->
|
||||||
|
net.sergeych.lyng.ContinueStatement(stmt.label, stmt.pos)
|
||||||
|
is net.sergeych.lyng.ReturnStatement -> {
|
||||||
|
val resultExpr = stmt.resultExpr?.let { unwrapDeep(it) }
|
||||||
|
net.sergeych.lyng.ReturnStatement(stmt.label, resultExpr, stmt.pos)
|
||||||
|
}
|
||||||
|
is net.sergeych.lyng.ThrowStatement ->
|
||||||
|
net.sergeych.lyng.ThrowStatement(unwrapDeep(stmt.throwExpr), stmt.pos)
|
||||||
|
is net.sergeych.lyng.WhenStatement -> {
|
||||||
|
net.sergeych.lyng.WhenStatement(
|
||||||
|
unwrapDeep(stmt.value),
|
||||||
|
stmt.cases.map { case ->
|
||||||
|
net.sergeych.lyng.WhenCase(
|
||||||
|
case.conditions.map { unwrapWhenCondition(it) },
|
||||||
|
unwrapDeep(case.block)
|
||||||
|
)
|
||||||
|
},
|
||||||
|
stmt.elseCase?.let { unwrapDeep(it) },
|
||||||
|
stmt.pos
|
||||||
|
)
|
||||||
|
}
|
||||||
|
else -> stmt
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun unwrapWhenCondition(cond: WhenCondition): WhenCondition {
|
||||||
|
return when (cond) {
|
||||||
|
is WhenEqualsCondition -> WhenEqualsCondition(unwrapDeep(cond.expr), cond.pos)
|
||||||
|
is WhenInCondition -> WhenInCondition(unwrapDeep(cond.expr), cond.negated, cond.pos)
|
||||||
|
is WhenIsCondition -> WhenIsCondition(unwrapDeep(cond.expr), cond.negated, cond.pos)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,441 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
class CmdBuilder {
|
||||||
|
sealed interface Operand {
|
||||||
|
data class IntVal(val value: Int) : Operand
|
||||||
|
data class LabelRef(val label: Label) : Operand
|
||||||
|
}
|
||||||
|
|
||||||
|
data class Label(val id: Int)
|
||||||
|
|
||||||
|
data class Instr(val op: Opcode, val operands: List<Operand>)
|
||||||
|
|
||||||
|
private val instructions = mutableListOf<Instr>()
|
||||||
|
private val posByInstr = mutableListOf<net.sergeych.lyng.Pos?>()
|
||||||
|
private val constPool = mutableListOf<BytecodeConst>()
|
||||||
|
private val labelPositions = mutableMapOf<Label, Int>()
|
||||||
|
private var nextLabelId = 0
|
||||||
|
private var currentPos: net.sergeych.lyng.Pos? = null
|
||||||
|
|
||||||
|
fun addConst(c: BytecodeConst): Int {
|
||||||
|
constPool += c
|
||||||
|
return constPool.lastIndex
|
||||||
|
}
|
||||||
|
|
||||||
|
fun emit(op: Opcode, vararg operands: Int) {
|
||||||
|
instructions += Instr(op, operands.map { Operand.IntVal(it) })
|
||||||
|
posByInstr += currentPos
|
||||||
|
}
|
||||||
|
|
||||||
|
fun emit(op: Opcode, operands: List<Operand>) {
|
||||||
|
instructions += Instr(op, operands)
|
||||||
|
posByInstr += currentPos
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setPos(pos: net.sergeych.lyng.Pos?) {
|
||||||
|
currentPos = pos
|
||||||
|
}
|
||||||
|
|
||||||
|
fun label(): Label = Label(nextLabelId++)
|
||||||
|
|
||||||
|
fun mark(label: Label) {
|
||||||
|
labelPositions[label] = instructions.size
|
||||||
|
}
|
||||||
|
|
||||||
|
fun build(
|
||||||
|
name: String,
|
||||||
|
localCount: Int,
|
||||||
|
addrCount: Int = 0,
|
||||||
|
returnLabels: Set<String> = emptySet(),
|
||||||
|
scopeSlotIndices: IntArray = IntArray(0),
|
||||||
|
scopeSlotNames: Array<String?> = emptyArray(),
|
||||||
|
scopeSlotIsModule: BooleanArray = BooleanArray(0),
|
||||||
|
localSlotNames: Array<String?> = emptyArray(),
|
||||||
|
localSlotMutables: BooleanArray = BooleanArray(0),
|
||||||
|
localSlotDelegated: BooleanArray = BooleanArray(0),
|
||||||
|
localSlotCaptures: BooleanArray = BooleanArray(0)
|
||||||
|
): CmdFunction {
|
||||||
|
val scopeSlotCount = scopeSlotIndices.size
|
||||||
|
require(scopeSlotNames.isEmpty() || scopeSlotNames.size == scopeSlotCount) {
|
||||||
|
"scope slot name mapping size mismatch"
|
||||||
|
}
|
||||||
|
require(scopeSlotIsModule.isEmpty() || scopeSlotIsModule.size == scopeSlotCount) {
|
||||||
|
"scope slot module mapping size mismatch"
|
||||||
|
}
|
||||||
|
require(localSlotNames.size == localSlotMutables.size) { "local slot metadata size mismatch" }
|
||||||
|
require(localSlotNames.size == localSlotDelegated.size) { "local slot delegation size mismatch" }
|
||||||
|
require(localSlotNames.size == localSlotCaptures.size) { "local slot capture size mismatch" }
|
||||||
|
val labelIps = mutableMapOf<Label, Int>()
|
||||||
|
for ((label, idx) in labelPositions) {
|
||||||
|
labelIps[label] = idx
|
||||||
|
}
|
||||||
|
val cmds = ArrayList<Cmd>(instructions.size)
|
||||||
|
for (ins in instructions) {
|
||||||
|
val kinds = operandKinds(ins.op)
|
||||||
|
if (kinds.size != ins.operands.size) {
|
||||||
|
error("Operand count mismatch for ${ins.op}: expected ${kinds.size}, got ${ins.operands.size}")
|
||||||
|
}
|
||||||
|
val operands = IntArray(kinds.size)
|
||||||
|
for (i in kinds.indices) {
|
||||||
|
val operand = ins.operands[i]
|
||||||
|
val v = when (operand) {
|
||||||
|
is Operand.IntVal -> operand.value
|
||||||
|
is Operand.LabelRef -> labelIps[operand.label]
|
||||||
|
?: error("Unknown label ${operand.label.id} for ${ins.op}")
|
||||||
|
}
|
||||||
|
operands[i] = v
|
||||||
|
}
|
||||||
|
cmds.add(createCmd(ins.op, operands, scopeSlotCount))
|
||||||
|
}
|
||||||
|
return CmdFunction(
|
||||||
|
name = name,
|
||||||
|
localCount = localCount,
|
||||||
|
addrCount = addrCount,
|
||||||
|
returnLabels = returnLabels,
|
||||||
|
scopeSlotCount = scopeSlotCount,
|
||||||
|
scopeSlotIndices = scopeSlotIndices,
|
||||||
|
scopeSlotNames = if (scopeSlotNames.isEmpty()) Array(scopeSlotCount) { null } else scopeSlotNames,
|
||||||
|
scopeSlotIsModule = if (scopeSlotIsModule.isEmpty()) BooleanArray(scopeSlotCount) else scopeSlotIsModule,
|
||||||
|
localSlotNames = localSlotNames,
|
||||||
|
localSlotMutables = localSlotMutables,
|
||||||
|
localSlotDelegated = localSlotDelegated,
|
||||||
|
localSlotCaptures = localSlotCaptures,
|
||||||
|
constants = constPool.toList(),
|
||||||
|
cmds = cmds.toTypedArray(),
|
||||||
|
posByIp = posByInstr.toTypedArray()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun operandKinds(op: Opcode): List<OperandKind> {
|
||||||
|
return when (op) {
|
||||||
|
Opcode.NOP, Opcode.RET_VOID, Opcode.POP_SCOPE, Opcode.POP_SLOT_PLAN, Opcode.POP_TRY,
|
||||||
|
Opcode.CLEAR_PENDING_THROWABLE, Opcode.RETHROW_PENDING -> emptyList()
|
||||||
|
Opcode.MOVE_OBJ, Opcode.MOVE_INT, Opcode.MOVE_REAL, Opcode.MOVE_BOOL, Opcode.BOX_OBJ,
|
||||||
|
Opcode.INT_TO_REAL, Opcode.REAL_TO_INT, Opcode.BOOL_TO_INT, Opcode.INT_TO_BOOL,
|
||||||
|
Opcode.OBJ_TO_BOOL, Opcode.GET_OBJ_CLASS,
|
||||||
|
Opcode.NEG_INT, Opcode.NEG_REAL, Opcode.NOT_BOOL, Opcode.INV_INT,
|
||||||
|
Opcode.ASSERT_IS ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.CHECK_IS, Opcode.MAKE_QUALIFIED_VIEW ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.RANGE_INT_BOUNDS ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.RET_LABEL, Opcode.THROW ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.RESOLVE_SCOPE_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ADDR)
|
||||||
|
Opcode.DELEGATED_GET_LOCAL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.DELEGATED_SET_LOCAL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.BIND_DELEGATE_LOCAL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.LOAD_OBJ_ADDR, Opcode.LOAD_INT_ADDR, Opcode.LOAD_REAL_ADDR, Opcode.LOAD_BOOL_ADDR ->
|
||||||
|
listOf(OperandKind.ADDR, OperandKind.SLOT)
|
||||||
|
Opcode.STORE_OBJ_ADDR, Opcode.STORE_INT_ADDR, Opcode.STORE_REAL_ADDR, Opcode.STORE_BOOL_ADDR ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ADDR)
|
||||||
|
Opcode.CONST_NULL ->
|
||||||
|
listOf(OperandKind.SLOT)
|
||||||
|
Opcode.CONST_OBJ, Opcode.CONST_INT, Opcode.CONST_REAL, Opcode.CONST_BOOL,
|
||||||
|
Opcode.MAKE_LAMBDA_FN ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.PUSH_SCOPE, Opcode.PUSH_SLOT_PLAN ->
|
||||||
|
listOf(OperandKind.CONST)
|
||||||
|
Opcode.PUSH_TRY ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.IP, OperandKind.IP)
|
||||||
|
Opcode.DECL_LOCAL, Opcode.DECL_EXT_PROPERTY, Opcode.DECL_DELEGATED, Opcode.DECL_DESTRUCTURE,
|
||||||
|
Opcode.DECL_ENUM, Opcode.DECL_FUNCTION, Opcode.DECL_CLASS,
|
||||||
|
Opcode.ASSIGN_DESTRUCTURE ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.ADD_INT, Opcode.SUB_INT, Opcode.MUL_INT, Opcode.DIV_INT, Opcode.MOD_INT,
|
||||||
|
Opcode.ADD_REAL, Opcode.SUB_REAL, Opcode.MUL_REAL, Opcode.DIV_REAL,
|
||||||
|
Opcode.AND_INT, Opcode.OR_INT, Opcode.XOR_INT, Opcode.SHL_INT, Opcode.SHR_INT, Opcode.USHR_INT,
|
||||||
|
Opcode.CMP_EQ_INT, Opcode.CMP_NEQ_INT, Opcode.CMP_LT_INT, Opcode.CMP_LTE_INT,
|
||||||
|
Opcode.CMP_GT_INT, Opcode.CMP_GTE_INT,
|
||||||
|
Opcode.CMP_EQ_REAL, Opcode.CMP_NEQ_REAL, Opcode.CMP_LT_REAL, Opcode.CMP_LTE_REAL,
|
||||||
|
Opcode.CMP_GT_REAL, Opcode.CMP_GTE_REAL,
|
||||||
|
Opcode.CMP_EQ_BOOL, Opcode.CMP_NEQ_BOOL,
|
||||||
|
Opcode.CMP_EQ_INT_REAL, Opcode.CMP_EQ_REAL_INT, Opcode.CMP_LT_INT_REAL, Opcode.CMP_LT_REAL_INT,
|
||||||
|
Opcode.CMP_LTE_INT_REAL, Opcode.CMP_LTE_REAL_INT, Opcode.CMP_GT_INT_REAL, Opcode.CMP_GT_REAL_INT,
|
||||||
|
Opcode.CMP_GTE_INT_REAL, Opcode.CMP_GTE_REAL_INT, Opcode.CMP_NEQ_INT_REAL, Opcode.CMP_NEQ_REAL_INT,
|
||||||
|
Opcode.CMP_EQ_OBJ, Opcode.CMP_NEQ_OBJ, Opcode.CMP_REF_EQ_OBJ, Opcode.CMP_REF_NEQ_OBJ,
|
||||||
|
Opcode.CMP_LT_OBJ, Opcode.CMP_LTE_OBJ, Opcode.CMP_GT_OBJ, Opcode.CMP_GTE_OBJ,
|
||||||
|
Opcode.ADD_OBJ, Opcode.SUB_OBJ, Opcode.MUL_OBJ, Opcode.DIV_OBJ, Opcode.MOD_OBJ, Opcode.CONTAINS_OBJ,
|
||||||
|
Opcode.AND_BOOL, Opcode.OR_BOOL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.ASSIGN_OP_OBJ ->
|
||||||
|
listOf(OperandKind.ID, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.CONST)
|
||||||
|
Opcode.INC_INT, Opcode.DEC_INT, Opcode.RET, Opcode.LOAD_THIS ->
|
||||||
|
listOf(OperandKind.SLOT)
|
||||||
|
Opcode.LOAD_THIS_VARIANT ->
|
||||||
|
listOf(OperandKind.ID, OperandKind.SLOT)
|
||||||
|
Opcode.JMP ->
|
||||||
|
listOf(OperandKind.IP)
|
||||||
|
Opcode.JMP_IF_TRUE, Opcode.JMP_IF_FALSE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.IP)
|
||||||
|
Opcode.CALL_DIRECT ->
|
||||||
|
listOf(OperandKind.ID, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.CALL_MEMBER_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ID, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.CALL_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.CALL_DYNAMIC_MEMBER ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.GET_INDEX ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.SET_INDEX ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.MAKE_RANGE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.LIST_LITERAL ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.GET_MEMBER_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ID, OperandKind.ID, OperandKind.SLOT)
|
||||||
|
Opcode.SET_MEMBER_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ID, OperandKind.ID, OperandKind.SLOT)
|
||||||
|
Opcode.GET_CLASS_SCOPE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.SET_CLASS_SCOPE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.GET_DYNAMIC_MEMBER ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.SET_DYNAMIC_MEMBER ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.ITER_PUSH ->
|
||||||
|
listOf(OperandKind.SLOT)
|
||||||
|
Opcode.ITER_POP, Opcode.ITER_CANCEL ->
|
||||||
|
emptyList()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum class OperandKind {
|
||||||
|
SLOT,
|
||||||
|
ADDR,
|
||||||
|
CONST,
|
||||||
|
IP,
|
||||||
|
COUNT,
|
||||||
|
ID,
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun createCmd(op: Opcode, operands: IntArray, scopeSlotCount: Int): Cmd {
|
||||||
|
return when (op) {
|
||||||
|
Opcode.NOP -> CmdNop()
|
||||||
|
Opcode.MOVE_OBJ -> CmdMoveObj(operands[0], operands[1])
|
||||||
|
Opcode.MOVE_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount) {
|
||||||
|
CmdMoveIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdMoveInt(operands[0], operands[1])
|
||||||
|
}
|
||||||
|
Opcode.MOVE_REAL -> CmdMoveReal(operands[0], operands[1])
|
||||||
|
Opcode.MOVE_BOOL -> CmdMoveBool(operands[0], operands[1])
|
||||||
|
Opcode.CONST_OBJ -> CmdConstObj(operands[0], operands[1])
|
||||||
|
Opcode.CONST_INT -> if (operands[1] >= scopeSlotCount) {
|
||||||
|
CmdConstIntLocal(operands[0], operands[1] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdConstInt(operands[0], operands[1])
|
||||||
|
}
|
||||||
|
Opcode.CONST_REAL -> CmdConstReal(operands[0], operands[1])
|
||||||
|
Opcode.CONST_BOOL -> CmdConstBool(operands[0], operands[1])
|
||||||
|
Opcode.CONST_NULL -> CmdConstNull(operands[0])
|
||||||
|
Opcode.MAKE_LAMBDA_FN -> CmdMakeLambda(operands[0], operands[1])
|
||||||
|
Opcode.BOX_OBJ -> CmdBoxObj(operands[0], operands[1])
|
||||||
|
Opcode.OBJ_TO_BOOL -> CmdObjToBool(operands[0], operands[1])
|
||||||
|
Opcode.GET_OBJ_CLASS -> CmdGetObjClass(operands[0], operands[1])
|
||||||
|
Opcode.RANGE_INT_BOUNDS -> CmdRangeIntBounds(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.LOAD_THIS -> CmdLoadThis(operands[0])
|
||||||
|
Opcode.LOAD_THIS_VARIANT -> CmdLoadThisVariant(operands[0], operands[1])
|
||||||
|
Opcode.MAKE_RANGE -> CmdMakeRange(operands[0], operands[1], operands[2], operands[3], operands[4])
|
||||||
|
Opcode.CHECK_IS -> CmdCheckIs(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.ASSERT_IS -> CmdAssertIs(operands[0], operands[1])
|
||||||
|
Opcode.MAKE_QUALIFIED_VIEW -> CmdMakeQualifiedView(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.RET_LABEL -> CmdRetLabel(operands[0], operands[1])
|
||||||
|
Opcode.THROW -> CmdThrow(operands[0], operands[1])
|
||||||
|
Opcode.RETHROW_PENDING -> CmdRethrowPending()
|
||||||
|
Opcode.RESOLVE_SCOPE_SLOT -> CmdResolveScopeSlot(operands[0], operands[1])
|
||||||
|
Opcode.DELEGATED_GET_LOCAL -> CmdDelegatedGetLocal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.DELEGATED_SET_LOCAL -> CmdDelegatedSetLocal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.BIND_DELEGATE_LOCAL -> CmdBindDelegateLocal(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.LOAD_OBJ_ADDR -> CmdLoadObjAddr(operands[0], operands[1])
|
||||||
|
Opcode.STORE_OBJ_ADDR -> CmdStoreObjAddr(operands[0], operands[1])
|
||||||
|
Opcode.LOAD_INT_ADDR -> CmdLoadIntAddr(operands[0], operands[1])
|
||||||
|
Opcode.STORE_INT_ADDR -> CmdStoreIntAddr(operands[0], operands[1])
|
||||||
|
Opcode.LOAD_REAL_ADDR -> CmdLoadRealAddr(operands[0], operands[1])
|
||||||
|
Opcode.STORE_REAL_ADDR -> CmdStoreRealAddr(operands[0], operands[1])
|
||||||
|
Opcode.LOAD_BOOL_ADDR -> CmdLoadBoolAddr(operands[0], operands[1])
|
||||||
|
Opcode.STORE_BOOL_ADDR -> CmdStoreBoolAddr(operands[0], operands[1])
|
||||||
|
Opcode.INT_TO_REAL -> CmdIntToReal(operands[0], operands[1])
|
||||||
|
Opcode.REAL_TO_INT -> CmdRealToInt(operands[0], operands[1])
|
||||||
|
Opcode.BOOL_TO_INT -> CmdBoolToInt(operands[0], operands[1])
|
||||||
|
Opcode.INT_TO_BOOL -> CmdIntToBool(operands[0], operands[1])
|
||||||
|
Opcode.ADD_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdAddIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdAddInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.SUB_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdSubIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdSubInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.MUL_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdMulIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdMulInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.DIV_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdDivIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdDivInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.MOD_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdModIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdModInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.NEG_INT -> CmdNegInt(operands[0], operands[1])
|
||||||
|
Opcode.INC_INT -> if (operands[0] >= scopeSlotCount) {
|
||||||
|
CmdIncIntLocal(operands[0] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdIncInt(operands[0])
|
||||||
|
}
|
||||||
|
Opcode.DEC_INT -> if (operands[0] >= scopeSlotCount) {
|
||||||
|
CmdDecIntLocal(operands[0] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdDecInt(operands[0])
|
||||||
|
}
|
||||||
|
Opcode.ADD_REAL -> CmdAddReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SUB_REAL -> CmdSubReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.MUL_REAL -> CmdMulReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.DIV_REAL -> CmdDivReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.NEG_REAL -> CmdNegReal(operands[0], operands[1])
|
||||||
|
Opcode.AND_INT -> CmdAndInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.OR_INT -> CmdOrInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.XOR_INT -> CmdXorInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SHL_INT -> CmdShlInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SHR_INT -> CmdShrInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.USHR_INT -> CmdUshrInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.INV_INT -> CmdInvInt(operands[0], operands[1])
|
||||||
|
Opcode.CMP_EQ_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdCmpEqIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdCmpEqInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.CMP_NEQ_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdCmpNeqIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdCmpNeqInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.CMP_LT_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdCmpLtIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdCmpLtInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.CMP_LTE_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdCmpLteIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdCmpLteInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.CMP_GT_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdCmpGtIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdCmpGtInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.CMP_GTE_INT -> if (operands[0] >= scopeSlotCount && operands[1] >= scopeSlotCount && operands[2] >= scopeSlotCount) {
|
||||||
|
CmdCmpGteIntLocal(operands[0] - scopeSlotCount, operands[1] - scopeSlotCount, operands[2] - scopeSlotCount)
|
||||||
|
} else {
|
||||||
|
CmdCmpGteInt(operands[0], operands[1], operands[2])
|
||||||
|
}
|
||||||
|
Opcode.CMP_EQ_REAL -> CmdCmpEqReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_NEQ_REAL -> CmdCmpNeqReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LT_REAL -> CmdCmpLtReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LTE_REAL -> CmdCmpLteReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GT_REAL -> CmdCmpGtReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GTE_REAL -> CmdCmpGteReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_EQ_BOOL -> CmdCmpEqBool(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_NEQ_BOOL -> CmdCmpNeqBool(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_EQ_INT_REAL -> CmdCmpEqIntReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_EQ_REAL_INT -> CmdCmpEqRealInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LT_INT_REAL -> CmdCmpLtIntReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LT_REAL_INT -> CmdCmpLtRealInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LTE_INT_REAL -> CmdCmpLteIntReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LTE_REAL_INT -> CmdCmpLteRealInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GT_INT_REAL -> CmdCmpGtIntReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GT_REAL_INT -> CmdCmpGtRealInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GTE_INT_REAL -> CmdCmpGteIntReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GTE_REAL_INT -> CmdCmpGteRealInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_NEQ_INT_REAL -> CmdCmpNeqIntReal(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_NEQ_REAL_INT -> CmdCmpNeqRealInt(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_EQ_OBJ -> CmdCmpEqObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_NEQ_OBJ -> CmdCmpNeqObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_REF_EQ_OBJ -> CmdCmpRefEqObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_REF_NEQ_OBJ -> CmdCmpRefNeqObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.NOT_BOOL -> CmdNotBool(operands[0], operands[1])
|
||||||
|
Opcode.AND_BOOL -> CmdAndBool(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.OR_BOOL -> CmdOrBool(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LT_OBJ -> CmdCmpLtObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_LTE_OBJ -> CmdCmpLteObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GT_OBJ -> CmdCmpGtObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CMP_GTE_OBJ -> CmdCmpGteObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.ADD_OBJ -> CmdAddObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SUB_OBJ -> CmdSubObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.MUL_OBJ -> CmdMulObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.DIV_OBJ -> CmdDivObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.MOD_OBJ -> CmdModObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.CONTAINS_OBJ -> CmdContainsObj(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.ASSIGN_OP_OBJ -> CmdAssignOpObj(operands[0], operands[1], operands[2], operands[3], operands[4])
|
||||||
|
Opcode.JMP -> CmdJmp(operands[0])
|
||||||
|
Opcode.JMP_IF_TRUE -> CmdJmpIfTrue(operands[0], operands[1])
|
||||||
|
Opcode.JMP_IF_FALSE -> CmdJmpIfFalse(operands[0], operands[1])
|
||||||
|
Opcode.RET -> CmdRet(operands[0])
|
||||||
|
Opcode.RET_VOID -> CmdRetVoid()
|
||||||
|
Opcode.PUSH_SCOPE -> CmdPushScope(operands[0])
|
||||||
|
Opcode.POP_SCOPE -> CmdPopScope()
|
||||||
|
Opcode.PUSH_SLOT_PLAN -> CmdPushSlotPlan(operands[0])
|
||||||
|
Opcode.POP_SLOT_PLAN -> CmdPopSlotPlan()
|
||||||
|
Opcode.PUSH_TRY -> CmdPushTry(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.POP_TRY -> CmdPopTry()
|
||||||
|
Opcode.CLEAR_PENDING_THROWABLE -> CmdClearPendingThrowable()
|
||||||
|
Opcode.DECL_LOCAL -> CmdDeclLocal(operands[0], operands[1])
|
||||||
|
Opcode.DECL_DELEGATED -> CmdDeclDelegated(operands[0], operands[1])
|
||||||
|
Opcode.DECL_DESTRUCTURE -> CmdDeclDestructure(operands[0], operands[1])
|
||||||
|
Opcode.DECL_ENUM -> CmdDeclEnum(operands[0], operands[1])
|
||||||
|
Opcode.DECL_FUNCTION -> CmdDeclFunction(operands[0], operands[1])
|
||||||
|
Opcode.DECL_CLASS -> CmdDeclClass(operands[0], operands[1])
|
||||||
|
Opcode.DECL_EXT_PROPERTY -> CmdDeclExtProperty(operands[0], operands[1])
|
||||||
|
Opcode.CALL_DIRECT -> CmdCallDirect(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.ASSIGN_DESTRUCTURE -> CmdAssignDestructure(operands[0], operands[1])
|
||||||
|
Opcode.CALL_MEMBER_SLOT -> CmdCallMemberSlot(operands[0], operands[1], operands[2], operands[3], operands[4])
|
||||||
|
Opcode.CALL_SLOT -> CmdCallSlot(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.CALL_DYNAMIC_MEMBER -> CmdCallDynamicMember(operands[0], operands[1], operands[2], operands[3], operands[4])
|
||||||
|
Opcode.GET_INDEX -> CmdGetIndex(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SET_INDEX -> CmdSetIndex(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.LIST_LITERAL -> CmdListLiteral(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.GET_MEMBER_SLOT -> CmdGetMemberSlot(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.SET_MEMBER_SLOT -> CmdSetMemberSlot(operands[0], operands[1], operands[2], operands[3])
|
||||||
|
Opcode.GET_CLASS_SCOPE -> CmdGetClassScope(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SET_CLASS_SCOPE -> CmdSetClassScope(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.GET_DYNAMIC_MEMBER -> CmdGetDynamicMember(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.SET_DYNAMIC_MEMBER -> CmdSetDynamicMember(operands[0], operands[1], operands[2])
|
||||||
|
Opcode.ITER_PUSH -> CmdIterPush(operands[0])
|
||||||
|
Opcode.ITER_POP -> CmdIterPop()
|
||||||
|
Opcode.ITER_CANCEL -> CmdIterCancel()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,347 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
object CmdDisassembler {
|
||||||
|
fun disassemble(fn: CmdFunction): String {
|
||||||
|
val out = StringBuilder()
|
||||||
|
val cmds = fn.cmds
|
||||||
|
for (i in cmds.indices) {
|
||||||
|
val (op, opValues) = opAndOperands(fn, cmds[i])
|
||||||
|
val kinds = operandKinds(op)
|
||||||
|
val operands = ArrayList<String>(kinds.size)
|
||||||
|
for (k in kinds.indices) {
|
||||||
|
val v = opValues.getOrElse(k) { 0 }
|
||||||
|
when (kinds[k]) {
|
||||||
|
OperandKind.SLOT -> {
|
||||||
|
val name = when {
|
||||||
|
v < fn.scopeSlotCount -> fn.scopeSlotNames[v]
|
||||||
|
else -> {
|
||||||
|
val localIndex = v - fn.scopeSlotCount
|
||||||
|
fn.localSlotNames.getOrNull(localIndex)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
operands += if (name != null) "s$v($name)" else "s$v"
|
||||||
|
}
|
||||||
|
OperandKind.ADDR -> operands += "a$v"
|
||||||
|
OperandKind.CONST -> operands += "k$v"
|
||||||
|
OperandKind.IP -> operands += "ip$v"
|
||||||
|
OperandKind.COUNT -> operands += "n$v"
|
||||||
|
OperandKind.ID -> operands += "#$v"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out.append(i).append(": ").append(op.name)
|
||||||
|
if (operands.isNotEmpty()) {
|
||||||
|
out.append(' ').append(operands.joinToString(", "))
|
||||||
|
}
|
||||||
|
out.append('\n')
|
||||||
|
}
|
||||||
|
val captureConsts = fn.constants.withIndex().mapNotNull { (idx, constVal) ->
|
||||||
|
val table = constVal as? BytecodeConst.CaptureTable ?: return@mapNotNull null
|
||||||
|
idx to table
|
||||||
|
}
|
||||||
|
if (captureConsts.isNotEmpty()) {
|
||||||
|
out.append("consts:\n")
|
||||||
|
for ((idx, table) in captureConsts) {
|
||||||
|
val entries = if (table.entries.isEmpty()) {
|
||||||
|
"[]"
|
||||||
|
} else {
|
||||||
|
table.entries.joinToString(prefix = "[", postfix = "]") { entry ->
|
||||||
|
"${entry.ownerKind}#${entry.ownerScopeId}:${entry.ownerSlotId}@s${entry.slotIndex}"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
out.append("k").append(idx).append(" CAPTURE_TABLE ").append(entries).append('\n')
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return out.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun opAndOperands(fn: CmdFunction, cmd: Cmd): Pair<Opcode, IntArray> {
|
||||||
|
return when (cmd) {
|
||||||
|
is CmdNop -> Opcode.NOP to intArrayOf()
|
||||||
|
is CmdMoveObj -> Opcode.MOVE_OBJ to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdMoveInt -> Opcode.MOVE_INT to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdMoveIntLocal -> Opcode.MOVE_INT to intArrayOf(cmd.src + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdMoveReal -> Opcode.MOVE_REAL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdMoveBool -> Opcode.MOVE_BOOL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdConstObj -> Opcode.CONST_OBJ to intArrayOf(cmd.constId, cmd.dst)
|
||||||
|
is CmdConstInt -> Opcode.CONST_INT to intArrayOf(cmd.constId, cmd.dst)
|
||||||
|
is CmdConstIntLocal -> Opcode.CONST_INT to intArrayOf(cmd.constId, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdConstReal -> Opcode.CONST_REAL to intArrayOf(cmd.constId, cmd.dst)
|
||||||
|
is CmdConstBool -> Opcode.CONST_BOOL to intArrayOf(cmd.constId, cmd.dst)
|
||||||
|
is CmdLoadThis -> Opcode.LOAD_THIS to intArrayOf(cmd.dst)
|
||||||
|
is CmdLoadThisVariant -> Opcode.LOAD_THIS_VARIANT to intArrayOf(cmd.typeId, cmd.dst)
|
||||||
|
is CmdConstNull -> Opcode.CONST_NULL to intArrayOf(cmd.dst)
|
||||||
|
is CmdMakeLambda -> Opcode.MAKE_LAMBDA_FN to intArrayOf(cmd.id, cmd.dst)
|
||||||
|
is CmdBoxObj -> Opcode.BOX_OBJ to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdObjToBool -> Opcode.OBJ_TO_BOOL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdGetObjClass -> Opcode.GET_OBJ_CLASS to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdCheckIs -> Opcode.CHECK_IS to intArrayOf(cmd.objSlot, cmd.typeSlot, cmd.dst)
|
||||||
|
is CmdAssertIs -> Opcode.ASSERT_IS to intArrayOf(cmd.objSlot, cmd.typeSlot)
|
||||||
|
is CmdMakeQualifiedView -> Opcode.MAKE_QUALIFIED_VIEW to intArrayOf(cmd.objSlot, cmd.typeSlot, cmd.dst)
|
||||||
|
is CmdRangeIntBounds -> Opcode.RANGE_INT_BOUNDS to intArrayOf(cmd.src, cmd.startSlot, cmd.endSlot, cmd.okSlot)
|
||||||
|
is CmdMakeRange -> Opcode.MAKE_RANGE to intArrayOf(
|
||||||
|
cmd.startSlot,
|
||||||
|
cmd.endSlot,
|
||||||
|
cmd.inclusiveSlot,
|
||||||
|
cmd.stepSlot,
|
||||||
|
cmd.dst
|
||||||
|
)
|
||||||
|
is CmdResolveScopeSlot -> Opcode.RESOLVE_SCOPE_SLOT to intArrayOf(cmd.scopeSlot, cmd.addrSlot)
|
||||||
|
is CmdDelegatedGetLocal -> Opcode.DELEGATED_GET_LOCAL to intArrayOf(cmd.delegateSlot, cmd.nameId, cmd.dst)
|
||||||
|
is CmdDelegatedSetLocal -> Opcode.DELEGATED_SET_LOCAL to intArrayOf(cmd.delegateSlot, cmd.nameId, cmd.valueSlot)
|
||||||
|
is CmdBindDelegateLocal -> Opcode.BIND_DELEGATE_LOCAL to intArrayOf(cmd.delegateSlot, cmd.nameId, cmd.accessId, cmd.dst)
|
||||||
|
is CmdLoadObjAddr -> Opcode.LOAD_OBJ_ADDR to intArrayOf(cmd.addrSlot, cmd.dst)
|
||||||
|
is CmdStoreObjAddr -> Opcode.STORE_OBJ_ADDR to intArrayOf(cmd.src, cmd.addrSlot)
|
||||||
|
is CmdLoadIntAddr -> Opcode.LOAD_INT_ADDR to intArrayOf(cmd.addrSlot, cmd.dst)
|
||||||
|
is CmdStoreIntAddr -> Opcode.STORE_INT_ADDR to intArrayOf(cmd.src, cmd.addrSlot)
|
||||||
|
is CmdLoadRealAddr -> Opcode.LOAD_REAL_ADDR to intArrayOf(cmd.addrSlot, cmd.dst)
|
||||||
|
is CmdStoreRealAddr -> Opcode.STORE_REAL_ADDR to intArrayOf(cmd.src, cmd.addrSlot)
|
||||||
|
is CmdLoadBoolAddr -> Opcode.LOAD_BOOL_ADDR to intArrayOf(cmd.addrSlot, cmd.dst)
|
||||||
|
is CmdStoreBoolAddr -> Opcode.STORE_BOOL_ADDR to intArrayOf(cmd.src, cmd.addrSlot)
|
||||||
|
is CmdIntToReal -> Opcode.INT_TO_REAL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdRealToInt -> Opcode.REAL_TO_INT to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdBoolToInt -> Opcode.BOOL_TO_INT to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdIntToBool -> Opcode.INT_TO_BOOL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdAddInt -> Opcode.ADD_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdAddIntLocal -> Opcode.ADD_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdSubInt -> Opcode.SUB_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdSubIntLocal -> Opcode.SUB_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdMulInt -> Opcode.MUL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdMulIntLocal -> Opcode.MUL_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdDivInt -> Opcode.DIV_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdDivIntLocal -> Opcode.DIV_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdModInt -> Opcode.MOD_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdModIntLocal -> Opcode.MOD_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdNegInt -> Opcode.NEG_INT to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdIncInt -> Opcode.INC_INT to intArrayOf(cmd.slot)
|
||||||
|
is CmdIncIntLocal -> Opcode.INC_INT to intArrayOf(cmd.slot + fn.scopeSlotCount)
|
||||||
|
is CmdDecInt -> Opcode.DEC_INT to intArrayOf(cmd.slot)
|
||||||
|
is CmdDecIntLocal -> Opcode.DEC_INT to intArrayOf(cmd.slot + fn.scopeSlotCount)
|
||||||
|
is CmdAddReal -> Opcode.ADD_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdSubReal -> Opcode.SUB_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdMulReal -> Opcode.MUL_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdDivReal -> Opcode.DIV_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdNegReal -> Opcode.NEG_REAL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdAndInt -> Opcode.AND_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdOrInt -> Opcode.OR_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdXorInt -> Opcode.XOR_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdShlInt -> Opcode.SHL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdShrInt -> Opcode.SHR_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdUshrInt -> Opcode.USHR_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdInvInt -> Opcode.INV_INT to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdCmpEqInt -> Opcode.CMP_EQ_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpEqIntLocal -> Opcode.CMP_EQ_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdCmpNeqInt -> Opcode.CMP_NEQ_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpNeqIntLocal -> Opcode.CMP_NEQ_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdCmpLtInt -> Opcode.CMP_LT_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLtIntLocal -> Opcode.CMP_LT_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdCmpLteInt -> Opcode.CMP_LTE_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLteIntLocal -> Opcode.CMP_LTE_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdCmpGtInt -> Opcode.CMP_GT_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGtIntLocal -> Opcode.CMP_GT_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdCmpGteInt -> Opcode.CMP_GTE_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGteIntLocal -> Opcode.CMP_GTE_INT to intArrayOf(cmd.a + fn.scopeSlotCount, cmd.b + fn.scopeSlotCount, cmd.dst + fn.scopeSlotCount)
|
||||||
|
is CmdCmpEqReal -> Opcode.CMP_EQ_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpNeqReal -> Opcode.CMP_NEQ_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLtReal -> Opcode.CMP_LT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLteReal -> Opcode.CMP_LTE_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGtReal -> Opcode.CMP_GT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGteReal -> Opcode.CMP_GTE_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpEqBool -> Opcode.CMP_EQ_BOOL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpNeqBool -> Opcode.CMP_NEQ_BOOL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpEqIntReal -> Opcode.CMP_EQ_INT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpEqRealInt -> Opcode.CMP_EQ_REAL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLtIntReal -> Opcode.CMP_LT_INT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLtRealInt -> Opcode.CMP_LT_REAL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLteIntReal -> Opcode.CMP_LTE_INT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLteRealInt -> Opcode.CMP_LTE_REAL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGtIntReal -> Opcode.CMP_GT_INT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGtRealInt -> Opcode.CMP_GT_REAL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGteIntReal -> Opcode.CMP_GTE_INT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGteRealInt -> Opcode.CMP_GTE_REAL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpNeqIntReal -> Opcode.CMP_NEQ_INT_REAL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpNeqRealInt -> Opcode.CMP_NEQ_REAL_INT to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpEqObj -> Opcode.CMP_EQ_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpNeqObj -> Opcode.CMP_NEQ_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpRefEqObj -> Opcode.CMP_REF_EQ_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpRefNeqObj -> Opcode.CMP_REF_NEQ_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdNotBool -> Opcode.NOT_BOOL to intArrayOf(cmd.src, cmd.dst)
|
||||||
|
is CmdAndBool -> Opcode.AND_BOOL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdOrBool -> Opcode.OR_BOOL to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLtObj -> Opcode.CMP_LT_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpLteObj -> Opcode.CMP_LTE_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGtObj -> Opcode.CMP_GT_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdCmpGteObj -> Opcode.CMP_GTE_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdAddObj -> Opcode.ADD_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdSubObj -> Opcode.SUB_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdMulObj -> Opcode.MUL_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdDivObj -> Opcode.DIV_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdModObj -> Opcode.MOD_OBJ to intArrayOf(cmd.a, cmd.b, cmd.dst)
|
||||||
|
is CmdContainsObj -> Opcode.CONTAINS_OBJ to intArrayOf(cmd.target, cmd.value, cmd.dst)
|
||||||
|
is CmdAssignOpObj -> Opcode.ASSIGN_OP_OBJ to intArrayOf(cmd.opId, cmd.targetSlot, cmd.valueSlot, cmd.dst, cmd.nameId)
|
||||||
|
is CmdJmp -> Opcode.JMP to intArrayOf(cmd.target)
|
||||||
|
is CmdJmpIfTrue -> Opcode.JMP_IF_TRUE to intArrayOf(cmd.cond, cmd.target)
|
||||||
|
is CmdJmpIfFalse -> Opcode.JMP_IF_FALSE to intArrayOf(cmd.cond, cmd.target)
|
||||||
|
is CmdRet -> Opcode.RET to intArrayOf(cmd.slot)
|
||||||
|
is CmdRetLabel -> Opcode.RET_LABEL to intArrayOf(cmd.labelId, cmd.slot)
|
||||||
|
is CmdRetVoid -> Opcode.RET_VOID to intArrayOf()
|
||||||
|
is CmdThrow -> Opcode.THROW to intArrayOf(cmd.posId, cmd.slot)
|
||||||
|
is CmdRethrowPending -> Opcode.RETHROW_PENDING to intArrayOf()
|
||||||
|
is CmdPushScope -> Opcode.PUSH_SCOPE to intArrayOf(cmd.planId)
|
||||||
|
is CmdPopScope -> Opcode.POP_SCOPE to intArrayOf()
|
||||||
|
is CmdPushSlotPlan -> Opcode.PUSH_SLOT_PLAN to intArrayOf(cmd.planId)
|
||||||
|
is CmdPopSlotPlan -> Opcode.POP_SLOT_PLAN to intArrayOf()
|
||||||
|
is CmdPushTry -> Opcode.PUSH_TRY to intArrayOf(cmd.exceptionSlot, cmd.catchIp, cmd.finallyIp)
|
||||||
|
is CmdPopTry -> Opcode.POP_TRY to intArrayOf()
|
||||||
|
is CmdClearPendingThrowable -> Opcode.CLEAR_PENDING_THROWABLE to intArrayOf()
|
||||||
|
is CmdDeclLocal -> Opcode.DECL_LOCAL to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdDeclDelegated -> Opcode.DECL_DELEGATED to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdDeclDestructure -> Opcode.DECL_DESTRUCTURE to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdDeclEnum -> Opcode.DECL_ENUM to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdDeclFunction -> Opcode.DECL_FUNCTION to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdDeclClass -> Opcode.DECL_CLASS to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdDeclExtProperty -> Opcode.DECL_EXT_PROPERTY to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdCallDirect -> Opcode.CALL_DIRECT to intArrayOf(cmd.id, cmd.argBase, cmd.argCount, cmd.dst)
|
||||||
|
is CmdAssignDestructure -> Opcode.ASSIGN_DESTRUCTURE to intArrayOf(cmd.constId, cmd.slot)
|
||||||
|
is CmdCallMemberSlot -> Opcode.CALL_MEMBER_SLOT to intArrayOf(cmd.recvSlot, cmd.methodId, cmd.argBase, cmd.argCount, cmd.dst)
|
||||||
|
is CmdCallSlot -> Opcode.CALL_SLOT to intArrayOf(cmd.calleeSlot, cmd.argBase, cmd.argCount, cmd.dst)
|
||||||
|
is CmdCallDynamicMember -> Opcode.CALL_DYNAMIC_MEMBER to intArrayOf(cmd.recvSlot, cmd.nameId, cmd.argBase, cmd.argCount, cmd.dst)
|
||||||
|
is CmdGetIndex -> Opcode.GET_INDEX to intArrayOf(cmd.targetSlot, cmd.indexSlot, cmd.dst)
|
||||||
|
is CmdSetIndex -> Opcode.SET_INDEX to intArrayOf(cmd.targetSlot, cmd.indexSlot, cmd.valueSlot)
|
||||||
|
is CmdListLiteral -> Opcode.LIST_LITERAL to intArrayOf(cmd.planId, cmd.baseSlot, cmd.count, cmd.dst)
|
||||||
|
is CmdGetMemberSlot -> Opcode.GET_MEMBER_SLOT to intArrayOf(cmd.recvSlot, cmd.fieldId, cmd.methodId, cmd.dst)
|
||||||
|
is CmdSetMemberSlot -> Opcode.SET_MEMBER_SLOT to intArrayOf(cmd.recvSlot, cmd.fieldId, cmd.methodId, cmd.valueSlot)
|
||||||
|
is CmdGetClassScope -> Opcode.GET_CLASS_SCOPE to intArrayOf(cmd.classSlot, cmd.nameId, cmd.dst)
|
||||||
|
is CmdSetClassScope -> Opcode.SET_CLASS_SCOPE to intArrayOf(cmd.classSlot, cmd.nameId, cmd.valueSlot)
|
||||||
|
is CmdGetDynamicMember -> Opcode.GET_DYNAMIC_MEMBER to intArrayOf(cmd.recvSlot, cmd.nameId, cmd.dst)
|
||||||
|
is CmdSetDynamicMember -> Opcode.SET_DYNAMIC_MEMBER to intArrayOf(cmd.recvSlot, cmd.nameId, cmd.valueSlot)
|
||||||
|
is CmdIterPush -> Opcode.ITER_PUSH to intArrayOf(cmd.iterSlot)
|
||||||
|
is CmdIterPop -> Opcode.ITER_POP to intArrayOf()
|
||||||
|
is CmdIterCancel -> Opcode.ITER_CANCEL to intArrayOf()
|
||||||
|
else -> error("Unsupported cmd in disassembler: ${cmd::class.simpleName}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private enum class OperandKind {
|
||||||
|
SLOT,
|
||||||
|
ADDR,
|
||||||
|
CONST,
|
||||||
|
IP,
|
||||||
|
COUNT,
|
||||||
|
ID,
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun operandKinds(op: Opcode): List<OperandKind> {
|
||||||
|
return when (op) {
|
||||||
|
Opcode.NOP, Opcode.RET_VOID, Opcode.POP_SCOPE, Opcode.POP_SLOT_PLAN, Opcode.POP_TRY,
|
||||||
|
Opcode.CLEAR_PENDING_THROWABLE, Opcode.RETHROW_PENDING,
|
||||||
|
Opcode.ITER_POP, Opcode.ITER_CANCEL -> emptyList()
|
||||||
|
Opcode.MOVE_OBJ, Opcode.MOVE_INT, Opcode.MOVE_REAL, Opcode.MOVE_BOOL, Opcode.BOX_OBJ,
|
||||||
|
Opcode.INT_TO_REAL, Opcode.REAL_TO_INT, Opcode.BOOL_TO_INT, Opcode.INT_TO_BOOL,
|
||||||
|
Opcode.NEG_INT, Opcode.NEG_REAL, Opcode.NOT_BOOL, Opcode.INV_INT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.OBJ_TO_BOOL, Opcode.GET_OBJ_CLASS, Opcode.ASSERT_IS ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.CHECK_IS, Opcode.MAKE_QUALIFIED_VIEW ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.RANGE_INT_BOUNDS ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.MAKE_RANGE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.RET_LABEL, Opcode.THROW ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.RESOLVE_SCOPE_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ADDR)
|
||||||
|
Opcode.DELEGATED_GET_LOCAL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.DELEGATED_SET_LOCAL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.BIND_DELEGATE_LOCAL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.LOAD_OBJ_ADDR, Opcode.LOAD_INT_ADDR, Opcode.LOAD_REAL_ADDR, Opcode.LOAD_BOOL_ADDR ->
|
||||||
|
listOf(OperandKind.ADDR, OperandKind.SLOT)
|
||||||
|
Opcode.STORE_OBJ_ADDR, Opcode.STORE_INT_ADDR, Opcode.STORE_REAL_ADDR, Opcode.STORE_BOOL_ADDR ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ADDR)
|
||||||
|
Opcode.CONST_NULL ->
|
||||||
|
listOf(OperandKind.SLOT)
|
||||||
|
Opcode.CONST_OBJ, Opcode.CONST_INT, Opcode.CONST_REAL, Opcode.CONST_BOOL,
|
||||||
|
Opcode.MAKE_LAMBDA_FN ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.PUSH_SCOPE, Opcode.PUSH_SLOT_PLAN ->
|
||||||
|
listOf(OperandKind.CONST)
|
||||||
|
Opcode.PUSH_TRY ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.IP, OperandKind.IP)
|
||||||
|
Opcode.DECL_LOCAL, Opcode.DECL_EXT_PROPERTY, Opcode.DECL_DELEGATED, Opcode.DECL_DESTRUCTURE,
|
||||||
|
Opcode.DECL_ENUM, Opcode.DECL_FUNCTION, Opcode.DECL_CLASS,
|
||||||
|
Opcode.ASSIGN_DESTRUCTURE ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.ADD_INT, Opcode.SUB_INT, Opcode.MUL_INT, Opcode.DIV_INT, Opcode.MOD_INT,
|
||||||
|
Opcode.ADD_REAL, Opcode.SUB_REAL, Opcode.MUL_REAL, Opcode.DIV_REAL,
|
||||||
|
Opcode.AND_INT, Opcode.OR_INT, Opcode.XOR_INT, Opcode.SHL_INT, Opcode.SHR_INT, Opcode.USHR_INT,
|
||||||
|
Opcode.CMP_EQ_INT, Opcode.CMP_NEQ_INT, Opcode.CMP_LT_INT, Opcode.CMP_LTE_INT,
|
||||||
|
Opcode.CMP_GT_INT, Opcode.CMP_GTE_INT,
|
||||||
|
Opcode.CMP_EQ_REAL, Opcode.CMP_NEQ_REAL, Opcode.CMP_LT_REAL, Opcode.CMP_LTE_REAL,
|
||||||
|
Opcode.CMP_GT_REAL, Opcode.CMP_GTE_REAL,
|
||||||
|
Opcode.CMP_EQ_BOOL, Opcode.CMP_NEQ_BOOL,
|
||||||
|
Opcode.CMP_EQ_INT_REAL, Opcode.CMP_EQ_REAL_INT, Opcode.CMP_LT_INT_REAL, Opcode.CMP_LT_REAL_INT,
|
||||||
|
Opcode.CMP_LTE_INT_REAL, Opcode.CMP_LTE_REAL_INT, Opcode.CMP_GT_INT_REAL, Opcode.CMP_GT_REAL_INT,
|
||||||
|
Opcode.CMP_GTE_INT_REAL, Opcode.CMP_GTE_REAL_INT, Opcode.CMP_NEQ_INT_REAL, Opcode.CMP_NEQ_REAL_INT,
|
||||||
|
Opcode.CMP_EQ_OBJ, Opcode.CMP_NEQ_OBJ, Opcode.CMP_REF_EQ_OBJ, Opcode.CMP_REF_NEQ_OBJ,
|
||||||
|
Opcode.CMP_LT_OBJ, Opcode.CMP_LTE_OBJ, Opcode.CMP_GT_OBJ, Opcode.CMP_GTE_OBJ,
|
||||||
|
Opcode.ADD_OBJ, Opcode.SUB_OBJ, Opcode.MUL_OBJ, Opcode.DIV_OBJ, Opcode.MOD_OBJ, Opcode.CONTAINS_OBJ,
|
||||||
|
Opcode.AND_BOOL, Opcode.OR_BOOL ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.ASSIGN_OP_OBJ ->
|
||||||
|
listOf(OperandKind.ID, OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT, OperandKind.CONST)
|
||||||
|
Opcode.INC_INT, Opcode.DEC_INT, Opcode.RET, Opcode.ITER_PUSH, Opcode.LOAD_THIS ->
|
||||||
|
listOf(OperandKind.SLOT)
|
||||||
|
Opcode.LOAD_THIS_VARIANT ->
|
||||||
|
listOf(OperandKind.ID, OperandKind.SLOT)
|
||||||
|
Opcode.JMP ->
|
||||||
|
listOf(OperandKind.IP)
|
||||||
|
Opcode.JMP_IF_TRUE, Opcode.JMP_IF_FALSE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.IP)
|
||||||
|
Opcode.CALL_DIRECT ->
|
||||||
|
listOf(OperandKind.ID, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.CALL_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.CALL_MEMBER_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ID, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.CALL_DYNAMIC_MEMBER ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.GET_INDEX ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.SET_INDEX ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.SLOT, OperandKind.SLOT)
|
||||||
|
Opcode.LIST_LITERAL ->
|
||||||
|
listOf(OperandKind.CONST, OperandKind.SLOT, OperandKind.COUNT, OperandKind.SLOT)
|
||||||
|
Opcode.GET_MEMBER_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ID, OperandKind.ID, OperandKind.SLOT)
|
||||||
|
Opcode.SET_MEMBER_SLOT ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.ID, OperandKind.ID, OperandKind.SLOT)
|
||||||
|
Opcode.GET_CLASS_SCOPE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.SET_CLASS_SCOPE ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.GET_DYNAMIC_MEMBER ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
Opcode.SET_DYNAMIC_MEMBER ->
|
||||||
|
listOf(OperandKind.SLOT, OperandKind.CONST, OperandKind.SLOT)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
data class CmdFunction(
|
||||||
|
val name: String,
|
||||||
|
val localCount: Int,
|
||||||
|
val addrCount: Int,
|
||||||
|
val returnLabels: Set<String>,
|
||||||
|
val scopeSlotCount: Int,
|
||||||
|
val scopeSlotIndices: IntArray,
|
||||||
|
val scopeSlotNames: Array<String?>,
|
||||||
|
val scopeSlotIsModule: BooleanArray,
|
||||||
|
val localSlotNames: Array<String?>,
|
||||||
|
val localSlotMutables: BooleanArray,
|
||||||
|
val localSlotDelegated: BooleanArray,
|
||||||
|
val localSlotCaptures: BooleanArray,
|
||||||
|
val constants: List<BytecodeConst>,
|
||||||
|
val cmds: Array<Cmd>,
|
||||||
|
val posByIp: Array<net.sergeych.lyng.Pos?>,
|
||||||
|
) {
|
||||||
|
init {
|
||||||
|
require(scopeSlotIndices.size == scopeSlotCount) { "scopeSlotIndices size mismatch" }
|
||||||
|
require(scopeSlotNames.size == scopeSlotCount) { "scopeSlotNames size mismatch" }
|
||||||
|
require(scopeSlotIsModule.size == scopeSlotCount) { "scopeSlotIsModule size mismatch" }
|
||||||
|
require(localSlotNames.size == localSlotMutables.size) { "localSlot metadata size mismatch" }
|
||||||
|
require(localSlotNames.size == localSlotDelegated.size) { "localSlot delegation size mismatch" }
|
||||||
|
require(localSlotNames.size == localSlotCaptures.size) { "localSlot capture size mismatch" }
|
||||||
|
require(localSlotNames.size <= localCount) { "localSlotNames exceed localCount" }
|
||||||
|
require(addrCount >= 0) { "addrCount must be non-negative" }
|
||||||
|
if (posByIp.isNotEmpty()) {
|
||||||
|
require(posByIp.size == cmds.size) { "posByIp size mismatch" }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun localSlotPlanByName(): Map<String, Int> {
|
||||||
|
val result = LinkedHashMap<String, Int>()
|
||||||
|
for (i in localSlotNames.indices) {
|
||||||
|
val name = localSlotNames[i] ?: continue
|
||||||
|
val existing = result[name]
|
||||||
|
if (existing == null) {
|
||||||
|
result[name] = i
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val existingIsCapture = localSlotCaptures.getOrNull(existing) == true
|
||||||
|
val currentIsCapture = localSlotCaptures.getOrNull(i) == true
|
||||||
|
if (existingIsCapture && !currentIsCapture) {
|
||||||
|
result[name] = i
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -0,0 +1,35 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
enum class CaptureOwnerFrameKind { MODULE, LOCAL }
|
||||||
|
|
||||||
|
data class LambdaCaptureEntry(
|
||||||
|
val ownerKind: CaptureOwnerFrameKind,
|
||||||
|
val ownerScopeId: Int,
|
||||||
|
val ownerSlotId: Int,
|
||||||
|
val ownerName: String,
|
||||||
|
val ownerIsMutable: Boolean,
|
||||||
|
val ownerIsDelegated: Boolean,
|
||||||
|
)
|
||||||
|
|
||||||
|
data class BytecodeCaptureEntry(
|
||||||
|
val ownerKind: CaptureOwnerFrameKind,
|
||||||
|
val ownerScopeId: Int,
|
||||||
|
val ownerSlotId: Int,
|
||||||
|
val slotIndex: Int,
|
||||||
|
)
|
||||||
@@ -0,0 +1,177 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
enum class Opcode(val code: Int) {
|
||||||
|
NOP(0x00),
|
||||||
|
MOVE_OBJ(0x01),
|
||||||
|
MOVE_INT(0x02),
|
||||||
|
MOVE_REAL(0x03),
|
||||||
|
MOVE_BOOL(0x04),
|
||||||
|
CONST_OBJ(0x05),
|
||||||
|
CONST_INT(0x06),
|
||||||
|
CONST_REAL(0x07),
|
||||||
|
CONST_BOOL(0x08),
|
||||||
|
CONST_NULL(0x09),
|
||||||
|
BOX_OBJ(0x0A),
|
||||||
|
RANGE_INT_BOUNDS(0x0B),
|
||||||
|
MAKE_RANGE(0x0C),
|
||||||
|
LOAD_THIS(0x0D),
|
||||||
|
LOAD_THIS_VARIANT(0x0F),
|
||||||
|
|
||||||
|
INT_TO_REAL(0x10),
|
||||||
|
REAL_TO_INT(0x11),
|
||||||
|
BOOL_TO_INT(0x12),
|
||||||
|
INT_TO_BOOL(0x13),
|
||||||
|
OBJ_TO_BOOL(0x14),
|
||||||
|
CHECK_IS(0x15),
|
||||||
|
ASSERT_IS(0x16),
|
||||||
|
MAKE_QUALIFIED_VIEW(0x17),
|
||||||
|
MAKE_LAMBDA_FN(0x18),
|
||||||
|
GET_OBJ_CLASS(0x19),
|
||||||
|
|
||||||
|
ADD_INT(0x20),
|
||||||
|
SUB_INT(0x21),
|
||||||
|
MUL_INT(0x22),
|
||||||
|
DIV_INT(0x23),
|
||||||
|
MOD_INT(0x24),
|
||||||
|
NEG_INT(0x25),
|
||||||
|
INC_INT(0x26),
|
||||||
|
DEC_INT(0x27),
|
||||||
|
|
||||||
|
ADD_REAL(0x30),
|
||||||
|
SUB_REAL(0x31),
|
||||||
|
MUL_REAL(0x32),
|
||||||
|
DIV_REAL(0x33),
|
||||||
|
NEG_REAL(0x34),
|
||||||
|
|
||||||
|
AND_INT(0x40),
|
||||||
|
OR_INT(0x41),
|
||||||
|
XOR_INT(0x42),
|
||||||
|
SHL_INT(0x43),
|
||||||
|
SHR_INT(0x44),
|
||||||
|
USHR_INT(0x45),
|
||||||
|
INV_INT(0x46),
|
||||||
|
|
||||||
|
CMP_EQ_INT(0x50),
|
||||||
|
CMP_NEQ_INT(0x51),
|
||||||
|
CMP_LT_INT(0x52),
|
||||||
|
CMP_LTE_INT(0x53),
|
||||||
|
CMP_GT_INT(0x54),
|
||||||
|
CMP_GTE_INT(0x55),
|
||||||
|
CMP_EQ_REAL(0x56),
|
||||||
|
CMP_NEQ_REAL(0x57),
|
||||||
|
CMP_LT_REAL(0x58),
|
||||||
|
CMP_LTE_REAL(0x59),
|
||||||
|
CMP_GT_REAL(0x5A),
|
||||||
|
CMP_GTE_REAL(0x5B),
|
||||||
|
CMP_EQ_BOOL(0x5C),
|
||||||
|
CMP_NEQ_BOOL(0x5D),
|
||||||
|
|
||||||
|
CMP_EQ_INT_REAL(0x60),
|
||||||
|
CMP_EQ_REAL_INT(0x61),
|
||||||
|
CMP_LT_INT_REAL(0x62),
|
||||||
|
CMP_LT_REAL_INT(0x63),
|
||||||
|
CMP_LTE_INT_REAL(0x64),
|
||||||
|
CMP_LTE_REAL_INT(0x65),
|
||||||
|
CMP_GT_INT_REAL(0x66),
|
||||||
|
CMP_GT_REAL_INT(0x67),
|
||||||
|
CMP_GTE_INT_REAL(0x68),
|
||||||
|
CMP_GTE_REAL_INT(0x69),
|
||||||
|
CMP_NEQ_INT_REAL(0x6A),
|
||||||
|
CMP_NEQ_REAL_INT(0x6B),
|
||||||
|
CMP_EQ_OBJ(0x6C),
|
||||||
|
CMP_NEQ_OBJ(0x6D),
|
||||||
|
CMP_REF_EQ_OBJ(0x6E),
|
||||||
|
CMP_REF_NEQ_OBJ(0x6F),
|
||||||
|
|
||||||
|
NOT_BOOL(0x70),
|
||||||
|
AND_BOOL(0x71),
|
||||||
|
OR_BOOL(0x72),
|
||||||
|
CMP_LT_OBJ(0x73),
|
||||||
|
CMP_LTE_OBJ(0x74),
|
||||||
|
CMP_GT_OBJ(0x75),
|
||||||
|
CMP_GTE_OBJ(0x76),
|
||||||
|
ADD_OBJ(0x77),
|
||||||
|
SUB_OBJ(0x78),
|
||||||
|
MUL_OBJ(0x79),
|
||||||
|
DIV_OBJ(0x7A),
|
||||||
|
MOD_OBJ(0x7B),
|
||||||
|
CONTAINS_OBJ(0x7C),
|
||||||
|
ASSIGN_OP_OBJ(0x7D),
|
||||||
|
|
||||||
|
JMP(0x80),
|
||||||
|
JMP_IF_TRUE(0x81),
|
||||||
|
JMP_IF_FALSE(0x82),
|
||||||
|
RET(0x83),
|
||||||
|
RET_VOID(0x84),
|
||||||
|
RET_LABEL(0xBA),
|
||||||
|
PUSH_SCOPE(0x85),
|
||||||
|
POP_SCOPE(0x86),
|
||||||
|
PUSH_SLOT_PLAN(0x87),
|
||||||
|
POP_SLOT_PLAN(0x88),
|
||||||
|
DECL_LOCAL(0x89),
|
||||||
|
DECL_EXT_PROPERTY(0x8A),
|
||||||
|
DECL_DELEGATED(0x8B),
|
||||||
|
DECL_DESTRUCTURE(0x8C),
|
||||||
|
PUSH_TRY(0x8D),
|
||||||
|
POP_TRY(0x8E),
|
||||||
|
CLEAR_PENDING_THROWABLE(0x8F),
|
||||||
|
|
||||||
|
CALL_DIRECT(0x90),
|
||||||
|
ASSIGN_DESTRUCTURE(0x91),
|
||||||
|
CALL_MEMBER_SLOT(0x92),
|
||||||
|
CALL_SLOT(0x93),
|
||||||
|
|
||||||
|
GET_INDEX(0xA2),
|
||||||
|
SET_INDEX(0xA3),
|
||||||
|
LIST_LITERAL(0xA5),
|
||||||
|
GET_MEMBER_SLOT(0xA8),
|
||||||
|
SET_MEMBER_SLOT(0xA9),
|
||||||
|
GET_CLASS_SCOPE(0xAA),
|
||||||
|
SET_CLASS_SCOPE(0xAB),
|
||||||
|
GET_DYNAMIC_MEMBER(0xAC),
|
||||||
|
SET_DYNAMIC_MEMBER(0xAD),
|
||||||
|
CALL_DYNAMIC_MEMBER(0xAE),
|
||||||
|
|
||||||
|
RESOLVE_SCOPE_SLOT(0xB1),
|
||||||
|
LOAD_OBJ_ADDR(0xB2),
|
||||||
|
STORE_OBJ_ADDR(0xB3),
|
||||||
|
LOAD_INT_ADDR(0xB4),
|
||||||
|
STORE_INT_ADDR(0xB5),
|
||||||
|
LOAD_REAL_ADDR(0xB6),
|
||||||
|
STORE_REAL_ADDR(0xB7),
|
||||||
|
LOAD_BOOL_ADDR(0xB8),
|
||||||
|
STORE_BOOL_ADDR(0xB9),
|
||||||
|
THROW(0xBB),
|
||||||
|
RETHROW_PENDING(0xBC),
|
||||||
|
DECL_ENUM(0xBE),
|
||||||
|
ITER_PUSH(0xBF),
|
||||||
|
ITER_POP(0xC0),
|
||||||
|
ITER_CANCEL(0xC1),
|
||||||
|
DELEGATED_GET_LOCAL(0xC2),
|
||||||
|
DELEGATED_SET_LOCAL(0xC3),
|
||||||
|
BIND_DELEGATE_LOCAL(0xC4),
|
||||||
|
DECL_FUNCTION(0xC5),
|
||||||
|
DECL_CLASS(0xC6),
|
||||||
|
;
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
private val byCode: Map<Int, Opcode> = values().associateBy { it.code }
|
||||||
|
fun fromCode(code: Int): Opcode? = byCode[code]
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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
|
||||||
|
|
||||||
|
enum class SlotType(val code: Byte) {
|
||||||
|
UNKNOWN(0),
|
||||||
|
OBJ(1),
|
||||||
|
INT(2),
|
||||||
|
REAL(3),
|
||||||
|
BOOL(4),
|
||||||
|
}
|
||||||
@@ -108,8 +108,9 @@ object LyngFormatter {
|
|||||||
if (t == "finally") return true
|
if (t == "finally") return true
|
||||||
|
|
||||||
// Short definition form: fun x() = or val x =
|
// Short definition form: fun x() = or val x =
|
||||||
if (Regex("^(override\\s+)?(fun|fn)\\b.*=\\s*$").matches(t)) return true
|
// We allow optional 'static' as well
|
||||||
if (Regex("^(private\\s+|protected\\s+|public\\s+|override\\s+)?(val|var)\\b.*=\\s*$").matches(t)) return true
|
if (Regex("^(static\\s+)?(override\\s+)?(fun|fn)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
if (Regex("^(static\\s+)?(private\\s+|protected\\s+|public\\s+|override\\s+)?(val|var)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
|
||||||
// property accessors ending with ) or =
|
// property accessors ending with ) or =
|
||||||
if (isAccessorRelated(t)) {
|
if (isAccessorRelated(t)) {
|
||||||
@@ -122,7 +123,8 @@ object LyngFormatter {
|
|||||||
val t = s.trim()
|
val t = s.trim()
|
||||||
if (!t.endsWith("=")) return false
|
if (!t.endsWith("=")) return false
|
||||||
// Is it a function or property definition?
|
// Is it a function or property definition?
|
||||||
if (Regex("\\b(fun|fn|val|var)\\b").containsMatchIn(t)) return true
|
// (Note: we exclude 'static' here to avoid double indent if it's already handled)
|
||||||
|
if (Regex("^(override\\s+)?(fun|fn|val|var)\\b").containsMatchIn(t)) return true
|
||||||
// Is it an accessor?
|
// Is it an accessor?
|
||||||
if (isPropertyAccessor(t)) return true
|
if (isPropertyAccessor(t)) return true
|
||||||
return false
|
return false
|
||||||
|
|||||||
@@ -41,9 +41,9 @@ private val fallbackKeywordIds = setOf(
|
|||||||
// boolean operators
|
// boolean operators
|
||||||
"and", "or", "not",
|
"and", "or", "not",
|
||||||
// declarations & modifiers
|
// declarations & modifiers
|
||||||
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
"fun", "fn", "class", "interface", "enum", "val", "var", "type", "import", "package",
|
||||||
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
||||||
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
"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"
|
||||||
@@ -74,7 +74,7 @@ private fun kindOf(type: Type, value: String): HighlightKind? = when (type) {
|
|||||||
Type.COMMA, Type.SEMICOLON, Type.COLON -> HighlightKind.Punctuation
|
Type.COMMA, Type.SEMICOLON, Type.COLON -> HighlightKind.Punctuation
|
||||||
|
|
||||||
// textual control keywords
|
// textual control keywords
|
||||||
Type.IN, Type.NOTIN, Type.IS, Type.NOTIS, Type.AS, Type.ASNULL, Type.BY, Type.OBJECT,
|
Type.IN, Type.NOTIN, Type.IS, Type.NOTIS, Type.AS, Type.ASNULL, Type.BY, Type.STEP, Type.OBJECT,
|
||||||
Type.AND, Type.OR, Type.NOT -> HighlightKind.Keyword
|
Type.AND, Type.OR, Type.NOT -> HighlightKind.Keyword
|
||||||
|
|
||||||
// labels / annotations
|
// labels / annotations
|
||||||
@@ -242,6 +242,7 @@ private fun applyEnumConstantHeuristics(
|
|||||||
var j = i + 1
|
var j = i + 1
|
||||||
// skip optional whitespace/newlines tokens are separate types, so we just check IDs and braces
|
// skip optional whitespace/newlines tokens are separate types, so we just check IDs and braces
|
||||||
if (j < tokens.size && tokens[j].type == Type.ID) j++ else { i++; continue }
|
if (j < tokens.size && tokens[j].type == Type.ID) j++ else { i++; continue }
|
||||||
|
if (j < tokens.size && tokens[j].type == Type.STAR) j++
|
||||||
if (j < tokens.size && tokens[j].type == Type.LBRACE) {
|
if (j < tokens.size && tokens[j].type == Type.LBRACE) {
|
||||||
j++
|
j++
|
||||||
while (j < tokens.size) {
|
while (j < tokens.size) {
|
||||||
|
|||||||
@@ -36,7 +36,7 @@ data class CompletionItem(
|
|||||||
val priority: Double = 0.0,
|
val priority: Double = 0.0,
|
||||||
)
|
)
|
||||||
|
|
||||||
enum class Kind { Function, Class_, Enum, Value, Method, Field }
|
enum class Kind { Function, Class_, Enum, TypeAlias, Value, Method, Field }
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Platform-free, lenient import provider that never fails on unknown packages.
|
* Platform-free, lenient import provider that never fails on unknown packages.
|
||||||
@@ -118,9 +118,11 @@ object CompletionEngineLight {
|
|||||||
val classes = decls.filterIsInstance<MiniClassDecl>().sortedBy { it.name.lowercase() }
|
val classes = decls.filterIsInstance<MiniClassDecl>().sortedBy { it.name.lowercase() }
|
||||||
val enums = decls.filterIsInstance<MiniEnumDecl>().sortedBy { it.name.lowercase() }
|
val enums = decls.filterIsInstance<MiniEnumDecl>().sortedBy { it.name.lowercase() }
|
||||||
val vals = decls.filterIsInstance<MiniValDecl>().sortedBy { it.name.lowercase() }
|
val vals = decls.filterIsInstance<MiniValDecl>().sortedBy { it.name.lowercase() }
|
||||||
|
val aliases = decls.filterIsInstance<MiniTypeAliasDecl>().sortedBy { it.name.lowercase() }
|
||||||
funs.forEach { offerDeclAdd(out, prefix, it) }
|
funs.forEach { offerDeclAdd(out, prefix, it) }
|
||||||
classes.forEach { offerDeclAdd(out, prefix, it) }
|
classes.forEach { offerDeclAdd(out, prefix, it) }
|
||||||
enums.forEach { offerDeclAdd(out, prefix, it) }
|
enums.forEach { offerDeclAdd(out, prefix, it) }
|
||||||
|
aliases.forEach { offerDeclAdd(out, prefix, it) }
|
||||||
vals.forEach { offerDeclAdd(out, prefix, it) }
|
vals.forEach { offerDeclAdd(out, prefix, it) }
|
||||||
|
|
||||||
// Imported and builtin
|
// Imported and builtin
|
||||||
@@ -135,9 +137,11 @@ object CompletionEngineLight {
|
|||||||
val classes = decls.filterIsInstance<MiniClassDecl>().sortedBy { it.name.lowercase() }
|
val classes = decls.filterIsInstance<MiniClassDecl>().sortedBy { it.name.lowercase() }
|
||||||
val enums = decls.filterIsInstance<MiniEnumDecl>().sortedBy { it.name.lowercase() }
|
val enums = decls.filterIsInstance<MiniEnumDecl>().sortedBy { it.name.lowercase() }
|
||||||
val vals = decls.filterIsInstance<MiniValDecl>().sortedBy { it.name.lowercase() }
|
val vals = decls.filterIsInstance<MiniValDecl>().sortedBy { it.name.lowercase() }
|
||||||
|
val aliases = decls.filterIsInstance<MiniTypeAliasDecl>().sortedBy { it.name.lowercase() }
|
||||||
funs.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
funs.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
||||||
classes.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
classes.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
||||||
enums.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
enums.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
||||||
|
aliases.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
||||||
vals.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
vals.forEach { if (externalAdded < budget) { offerDeclAdd(out, prefix, it); externalAdded++ } }
|
||||||
if (out.size >= cap || externalAdded >= budget) break
|
if (out.size >= cap || externalAdded >= budget) break
|
||||||
}
|
}
|
||||||
@@ -196,6 +200,9 @@ object CompletionEngineLight {
|
|||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
add(CompletionItem(m.name, if (m.mutable) Kind.Value else Kind.Field, typeText = typeOf(m.type), priority = 100.0))
|
add(CompletionItem(m.name, if (m.mutable) Kind.Value else Kind.Field, typeText = typeOf(m.type), priority = 100.0))
|
||||||
}
|
}
|
||||||
|
is MiniMemberTypeAliasDecl -> {
|
||||||
|
add(CompletionItem(m.name, Kind.TypeAlias, typeText = typeOf(m.target), priority = 100.0))
|
||||||
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniInitDecl -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -225,6 +232,7 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
is MiniClassDecl -> add(CompletionItem(d.name, Kind.Class_))
|
is MiniClassDecl -> add(CompletionItem(d.name, Kind.Class_))
|
||||||
is MiniEnumDecl -> add(CompletionItem(d.name, Kind.Enum))
|
is MiniEnumDecl -> add(CompletionItem(d.name, Kind.Enum))
|
||||||
|
is MiniTypeAliasDecl -> add(CompletionItem(d.name, Kind.TypeAlias, typeText = typeOf(d.target)))
|
||||||
is MiniValDecl -> add(CompletionItem(d.name, Kind.Value, typeText = typeOf(d.type)))
|
is MiniValDecl -> add(CompletionItem(d.name, Kind.Value, typeText = typeOf(d.type)))
|
||||||
// else -> add(CompletionItem(d.name, Kind.Value))
|
// else -> add(CompletionItem(d.name, Kind.Value))
|
||||||
}
|
}
|
||||||
@@ -289,6 +297,10 @@ object CompletionEngineLight {
|
|||||||
val ci = CompletionItem(name, Kind.Field, typeText = typeOf(chosen.type), priority = groupPriority)
|
val ci = CompletionItem(name, Kind.Field, typeText = typeOf(chosen.type), priority = groupPriority)
|
||||||
if (ci.name.startsWith(prefix, true)) out += ci
|
if (ci.name.startsWith(prefix, true)) out += ci
|
||||||
}
|
}
|
||||||
|
is MiniMemberTypeAliasDecl -> {
|
||||||
|
val ci = CompletionItem(name, Kind.TypeAlias, typeText = typeOf(rep.target), priority = groupPriority)
|
||||||
|
if (ci.name.startsWith(prefix, true)) out += ci
|
||||||
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniInitDecl -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -317,6 +329,8 @@ object CompletionEngineLight {
|
|||||||
}
|
}
|
||||||
is MiniMemberValDecl -> CompletionItem(name, Kind.Field, typeText = typeOf(m.type), priority = 50.0)
|
is MiniMemberValDecl -> CompletionItem(name, Kind.Field, typeText = typeOf(m.type), priority = 50.0)
|
||||||
is MiniValDecl -> CompletionItem(name, Kind.Field, typeText = typeOf(m.type), priority = 50.0)
|
is MiniValDecl -> CompletionItem(name, Kind.Field, typeText = typeOf(m.type), priority = 50.0)
|
||||||
|
is MiniMemberTypeAliasDecl -> CompletionItem(name, Kind.TypeAlias, typeText = typeOf(m.target), priority = 50.0)
|
||||||
|
is MiniTypeAliasDecl -> CompletionItem(name, Kind.TypeAlias, typeText = typeOf(m.target), priority = 50.0)
|
||||||
else -> CompletionItem(name, Kind.Method, tailText = "()", typeText = null, priority = 50.0)
|
else -> CompletionItem(name, Kind.Method, tailText = "()", typeText = null, priority = 50.0)
|
||||||
}
|
}
|
||||||
if (ci.name.startsWith(prefix, true)) {
|
if (ci.name.startsWith(prefix, true)) {
|
||||||
|
|||||||
@@ -34,6 +34,7 @@ object DocLookupUtils {
|
|||||||
is MiniFunDecl -> "Function"
|
is MiniFunDecl -> "Function"
|
||||||
is MiniClassDecl -> "Class"
|
is MiniClassDecl -> "Class"
|
||||||
is MiniEnumDecl -> "Enum"
|
is MiniEnumDecl -> "Enum"
|
||||||
|
is MiniTypeAliasDecl -> "TypeAlias"
|
||||||
is MiniValDecl -> if (d.mutable) "Variable" else "Value"
|
is MiniValDecl -> if (d.mutable) "Variable" else "Value"
|
||||||
}
|
}
|
||||||
return d.name to kind
|
return d.name to kind
|
||||||
@@ -87,6 +88,7 @@ object DocLookupUtils {
|
|||||||
val kind = when (m) {
|
val kind = when (m) {
|
||||||
is MiniMemberFunDecl -> "Function"
|
is MiniMemberFunDecl -> "Function"
|
||||||
is MiniMemberValDecl -> if (m.isStatic) "Value" else (if (m.mutable) "Variable" else "Value")
|
is MiniMemberValDecl -> if (m.isStatic) "Value" else (if (m.mutable) "Variable" else "Value")
|
||||||
|
is MiniMemberTypeAliasDecl -> "TypeAlias"
|
||||||
is MiniInitDecl -> "Initializer"
|
is MiniInitDecl -> "Initializer"
|
||||||
}
|
}
|
||||||
return m.name to kind
|
return m.name to kind
|
||||||
@@ -119,6 +121,7 @@ object DocLookupUtils {
|
|||||||
return when (d) {
|
return when (d) {
|
||||||
is MiniValDecl -> d.type ?: if (text != null && imported != null) inferTypeRefForVal(d, text, imported, mini) else null
|
is MiniValDecl -> d.type ?: if (text != null && imported != null) inferTypeRefForVal(d, text, imported, mini) else null
|
||||||
is MiniFunDecl -> d.returnType
|
is MiniFunDecl -> d.returnType
|
||||||
|
is MiniTypeAliasDecl -> d.target
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -142,6 +145,7 @@ object DocLookupUtils {
|
|||||||
is MiniMemberValDecl -> m.type ?: if (text != null && imported != null) {
|
is MiniMemberValDecl -> m.type ?: if (text != null && imported != null) {
|
||||||
inferTypeRefFromInitRange(m.initRange, m.nameStart, text, imported, mini)
|
inferTypeRefFromInitRange(m.initRange, m.nameStart, text, imported, mini)
|
||||||
} else null
|
} else null
|
||||||
|
is MiniMemberTypeAliasDecl -> m.target
|
||||||
|
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
@@ -436,7 +440,10 @@ object DocLookupUtils {
|
|||||||
val type = findTypeByRange(mini, sym.name, sym.declStart, text, imported)
|
val type = findTypeByRange(mini, sym.name, sym.declStart, text, imported)
|
||||||
simpleClassNameOf(type)?.let { return it }
|
simpleClassNameOf(type)?.let { return it }
|
||||||
// if it's a class/enum, return its name directly
|
// if it's a class/enum, return its name directly
|
||||||
if (sym.kind == net.sergeych.lyng.binding.SymbolKind.Class || sym.kind == net.sergeych.lyng.binding.SymbolKind.Enum) return sym.name
|
if (sym.kind == net.sergeych.lyng.binding.SymbolKind.Class ||
|
||||||
|
sym.kind == net.sergeych.lyng.binding.SymbolKind.Enum ||
|
||||||
|
sym.kind == net.sergeych.lyng.binding.SymbolKind.TypeAlias
|
||||||
|
) return sym.name
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -451,6 +458,7 @@ object DocLookupUtils {
|
|||||||
return when (d) {
|
return when (d) {
|
||||||
is MiniClassDecl -> d.name
|
is MiniClassDecl -> d.name
|
||||||
is MiniEnumDecl -> d.name
|
is MiniEnumDecl -> d.name
|
||||||
|
is MiniTypeAliasDecl -> d.name
|
||||||
is MiniValDecl -> simpleClassNameOf(d.type ?: inferTypeRefForVal(d, text, imported, mini))
|
is MiniValDecl -> simpleClassNameOf(d.type ?: inferTypeRefForVal(d, text, imported, mini))
|
||||||
is MiniFunDecl -> simpleClassNameOf(d.returnType)
|
is MiniFunDecl -> simpleClassNameOf(d.returnType)
|
||||||
}
|
}
|
||||||
@@ -565,6 +573,7 @@ object DocLookupUtils {
|
|||||||
val rt = when (mm) {
|
val rt = when (mm) {
|
||||||
is MiniMemberFunDecl -> mm.returnType
|
is MiniMemberFunDecl -> mm.returnType
|
||||||
is MiniMemberValDecl -> mm.type
|
is MiniMemberValDecl -> mm.type
|
||||||
|
is MiniMemberTypeAliasDecl -> mm.target
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
return simpleClassNameOf(rt)
|
return simpleClassNameOf(rt)
|
||||||
@@ -580,8 +589,10 @@ object DocLookupUtils {
|
|||||||
val rt = when (m) {
|
val rt = when (m) {
|
||||||
is MiniMemberFunDecl -> m.returnType
|
is MiniMemberFunDecl -> m.returnType
|
||||||
is MiniMemberValDecl -> m.type
|
is MiniMemberValDecl -> m.type
|
||||||
|
is MiniMemberTypeAliasDecl -> m.target
|
||||||
is MiniFunDecl -> m.returnType
|
is MiniFunDecl -> m.returnType
|
||||||
is MiniValDecl -> m.type
|
is MiniValDecl -> m.type
|
||||||
|
is MiniTypeAliasDecl -> m.target
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
simpleClassNameOf(rt)
|
simpleClassNameOf(rt)
|
||||||
@@ -921,6 +932,7 @@ object DocLookupUtils {
|
|||||||
return when (val m = resolved.second) {
|
return when (val m = resolved.second) {
|
||||||
is MiniMemberFunDecl -> m.returnType
|
is MiniMemberFunDecl -> m.returnType
|
||||||
is MiniMemberValDecl -> m.type ?: inferTypeRefFromInitRange(m.initRange, m.nameStart, fullText, imported, mini)
|
is MiniMemberValDecl -> m.type ?: inferTypeRefFromInitRange(m.initRange, m.nameStart, fullText, imported, mini)
|
||||||
|
is MiniMemberTypeAliasDecl -> m.target
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -943,6 +955,7 @@ object DocLookupUtils {
|
|||||||
is MiniEnumDecl -> syntheticTypeRef(d.name)
|
is MiniEnumDecl -> syntheticTypeRef(d.name)
|
||||||
is MiniValDecl -> d.type ?: inferTypeRefForVal(d, fullText, imported, mini)
|
is MiniValDecl -> d.type ?: inferTypeRefForVal(d, fullText, imported, mini)
|
||||||
is MiniFunDecl -> d.returnType
|
is MiniFunDecl -> d.returnType
|
||||||
|
is MiniTypeAliasDecl -> d.target
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1025,6 +1038,8 @@ object DocLookupUtils {
|
|||||||
is MiniGenericType -> simpleClassNameOf(t.base)
|
is MiniGenericType -> simpleClassNameOf(t.base)
|
||||||
is MiniFunctionType -> null
|
is MiniFunctionType -> null
|
||||||
is MiniTypeVar -> null
|
is MiniTypeVar -> null
|
||||||
|
is MiniTypeUnion -> null
|
||||||
|
is MiniTypeIntersection -> null
|
||||||
}
|
}
|
||||||
|
|
||||||
fun typeOf(t: MiniTypeRef?): String = when (t) {
|
fun typeOf(t: MiniTypeRef?): String = when (t) {
|
||||||
@@ -1035,6 +1050,8 @@ object DocLookupUtils {
|
|||||||
r + "(" + t.params.joinToString(", ") { typeOf(it) } + ") -> " + typeOf(t.returnType) + (if (t.nullable) "?" else "")
|
r + "(" + t.params.joinToString(", ") { typeOf(it) } + ") -> " + typeOf(t.returnType) + (if (t.nullable) "?" else "")
|
||||||
}
|
}
|
||||||
is MiniTypeVar -> t.name + (if (t.nullable) "?" else "")
|
is MiniTypeVar -> t.name + (if (t.nullable) "?" else "")
|
||||||
|
is MiniTypeUnion -> t.options.joinToString(" | ") { typeOf(it) } + (if (t.nullable) "?" else "")
|
||||||
|
is MiniTypeIntersection -> t.options.joinToString(" & ") { typeOf(it) } + (if (t.nullable) "?" else "")
|
||||||
null -> ""
|
null -> ""
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -39,10 +39,11 @@ inline fun <reified T : Obj> Scope.addFnDoc(
|
|||||||
returns: TypeDoc? = null,
|
returns: TypeDoc? = null,
|
||||||
tags: Map<String, List<String>> = emptyMap(),
|
tags: Map<String, List<String>> = emptyMap(),
|
||||||
moduleName: String? = null,
|
moduleName: String? = null,
|
||||||
|
callSignature: net.sergeych.lyng.CallSignature? = null,
|
||||||
crossinline fn: suspend Scope.() -> T
|
crossinline fn: suspend Scope.() -> T
|
||||||
) {
|
) {
|
||||||
// Register runtime function(s)
|
// Register runtime function(s)
|
||||||
addFn(*names) { fn() }
|
addFn(*names, callSignature = callSignature) { fn() }
|
||||||
// Determine module
|
// Determine module
|
||||||
val mod = moduleName ?: findModuleNameOrUnknown()
|
val mod = moduleName ?: findModuleNameOrUnknown()
|
||||||
// Register docs once per name
|
// Register docs once per name
|
||||||
|
|||||||
@@ -44,13 +44,22 @@ data class MiniDoc(
|
|||||||
fun parse(range: MiniRange, lines: Iterable<String>, extraTags: Map<String, List<String>> = emptyMap()): MiniDoc {
|
fun parse(range: MiniRange, lines: Iterable<String>, extraTags: Map<String, List<String>> = emptyMap()): MiniDoc {
|
||||||
val parsedTags = mutableMapOf<String, MutableList<String>>()
|
val parsedTags = mutableMapOf<String, MutableList<String>>()
|
||||||
var currentTag: String? = null
|
var currentTag: String? = null
|
||||||
val currentContent = StringBuilder()
|
val currentContent = mutableListOf<String>()
|
||||||
|
|
||||||
fun flush() {
|
fun flush() {
|
||||||
currentTag?.let { tag ->
|
currentTag?.let { tag ->
|
||||||
parsedTags.getOrPut(tag) { mutableListOf() }.add(currentContent.toString().trim())
|
val trimmedContent = if (currentContent.size > 1) {
|
||||||
|
// First line is common content, we want to trim indent from subsequent lines
|
||||||
|
// based on THEIR common indent.
|
||||||
|
val firstLine = currentContent[0]
|
||||||
|
val remaining = currentContent.drop(1).joinToString("\n").trimIndent()
|
||||||
|
if (remaining.isEmpty()) firstLine else firstLine + "\n" + remaining
|
||||||
|
} else {
|
||||||
|
currentContent.joinToString("\n")
|
||||||
|
}
|
||||||
|
parsedTags.getOrPut(tag) { mutableListOf() }.add(trimmedContent.trim())
|
||||||
}
|
}
|
||||||
currentContent.setLength(0)
|
currentContent.clear()
|
||||||
}
|
}
|
||||||
|
|
||||||
val descriptionLines = mutableListOf<String>()
|
val descriptionLines = mutableListOf<String>()
|
||||||
@@ -58,33 +67,45 @@ data class MiniDoc(
|
|||||||
|
|
||||||
for (rawLine in lines) {
|
for (rawLine in lines) {
|
||||||
for (line in rawLine.lines()) {
|
for (line in rawLine.lines()) {
|
||||||
val trimmed = line.trim()
|
// Strip leading '*' and space if present (standard doc comment style)
|
||||||
|
val cleanedLine = line.trim().let {
|
||||||
|
if (it.startsWith("*")) it.substring(1).removePrefix(" ") else line
|
||||||
|
}
|
||||||
|
val trimmed = cleanedLine.trim()
|
||||||
if (trimmed.startsWith("@")) {
|
if (trimmed.startsWith("@")) {
|
||||||
inTags = true
|
inTags = true
|
||||||
flush()
|
flush()
|
||||||
val parts = trimmed.substring(1).split(Regex("\\s+"), 2)
|
val parts = trimmed.substring(1).split(Regex("\\s+"), 2)
|
||||||
currentTag = parts[0]
|
currentTag = parts[0]
|
||||||
currentContent.append(parts.getOrNull(1) ?: "")
|
val tagFirstLine = parts.getOrNull(1) ?: ""
|
||||||
|
if (tagFirstLine.isNotEmpty()) {
|
||||||
|
// Find where the content starts in the cleaned line to preserve relative indentation
|
||||||
|
val contentIndex = cleanedLine.indexOf(tagFirstLine)
|
||||||
|
if (contentIndex >= 0) {
|
||||||
|
currentContent.add(cleanedLine.substring(contentIndex))
|
||||||
|
} else {
|
||||||
|
currentContent.add(tagFirstLine)
|
||||||
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
if (inTags) {
|
if (inTags) {
|
||||||
if (currentContent.isNotEmpty()) currentContent.append("\n")
|
currentContent.add(cleanedLine)
|
||||||
currentContent.append(line)
|
|
||||||
} else {
|
} else {
|
||||||
descriptionLines.add(line)
|
descriptionLines.add(cleanedLine)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
flush()
|
flush()
|
||||||
|
|
||||||
val raw = descriptionLines.joinToString("\n").trimEnd()
|
val raw = descriptionLines.joinToString("\n").trimIndent().trim()
|
||||||
val summary = raw.lines().firstOrNull { it.isNotBlank() }?.trim()
|
val summary = raw.lines().firstOrNull { it.isNotBlank() }?.trim()
|
||||||
|
|
||||||
val finalTags = parsedTags.toMutableMap()
|
val finalTags = parsedTags.toMutableMap()
|
||||||
extraTags.forEach { (k, v) ->
|
extraTags.forEach { (k, v) ->
|
||||||
finalTags.getOrPut(k) { mutableListOf() }.addAll(v)
|
finalTags.getOrPut(k) { mutableListOf() }.addAll(v)
|
||||||
}
|
}
|
||||||
|
|
||||||
return MiniDoc(range, raw, summary, finalTags)
|
return MiniDoc(range, raw, summary, finalTags)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -129,6 +150,18 @@ data class MiniTypeVar(
|
|||||||
val nullable: Boolean
|
val nullable: Boolean
|
||||||
) : MiniTypeRef
|
) : MiniTypeRef
|
||||||
|
|
||||||
|
data class MiniTypeUnion(
|
||||||
|
override val range: MiniRange,
|
||||||
|
val options: List<MiniTypeRef>,
|
||||||
|
val nullable: Boolean
|
||||||
|
) : MiniTypeRef
|
||||||
|
|
||||||
|
data class MiniTypeIntersection(
|
||||||
|
override val range: MiniRange,
|
||||||
|
val options: List<MiniTypeRef>,
|
||||||
|
val nullable: Boolean
|
||||||
|
) : MiniTypeRef
|
||||||
|
|
||||||
// Script and declarations (lean subset; can be extended later)
|
// Script and declarations (lean subset; can be extended later)
|
||||||
sealed interface MiniNamedDecl : MiniNode {
|
sealed interface MiniNamedDecl : MiniNode {
|
||||||
val name: String
|
val name: String
|
||||||
@@ -208,6 +241,17 @@ data class MiniEnumDecl(
|
|||||||
val entryPositions: List<Pos> = emptyList()
|
val entryPositions: List<Pos> = emptyList()
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
|
data class MiniTypeAliasDecl(
|
||||||
|
override val range: MiniRange,
|
||||||
|
override val name: String,
|
||||||
|
val typeParams: List<String>,
|
||||||
|
val target: MiniTypeRef?,
|
||||||
|
override val doc: MiniDoc?,
|
||||||
|
override val nameStart: Pos,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
override val isStatic: Boolean = false,
|
||||||
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniCtorField(
|
data class MiniCtorField(
|
||||||
val name: String,
|
val name: String,
|
||||||
val mutable: Boolean,
|
val mutable: Boolean,
|
||||||
@@ -257,6 +301,17 @@ data class MiniMemberValDecl(
|
|||||||
override val isExtern: Boolean = false,
|
override val isExtern: Boolean = false,
|
||||||
) : MiniMemberDecl
|
) : MiniMemberDecl
|
||||||
|
|
||||||
|
data class MiniMemberTypeAliasDecl(
|
||||||
|
override val range: MiniRange,
|
||||||
|
override val name: String,
|
||||||
|
val typeParams: List<String>,
|
||||||
|
val target: MiniTypeRef?,
|
||||||
|
override val doc: MiniDoc?,
|
||||||
|
override val nameStart: Pos,
|
||||||
|
override val isStatic: Boolean = false,
|
||||||
|
override val isExtern: Boolean = false,
|
||||||
|
) : MiniMemberDecl
|
||||||
|
|
||||||
data class MiniInitDecl(
|
data class MiniInitDecl(
|
||||||
override val range: MiniRange,
|
override val range: MiniRange,
|
||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
@@ -286,6 +341,7 @@ interface MiniAstSink {
|
|||||||
fun onInitDecl(node: MiniInitDecl) {}
|
fun onInitDecl(node: MiniInitDecl) {}
|
||||||
fun onClassDecl(node: MiniClassDecl) {}
|
fun onClassDecl(node: MiniClassDecl) {}
|
||||||
fun onEnumDecl(node: MiniEnumDecl) {}
|
fun onEnumDecl(node: MiniEnumDecl) {}
|
||||||
|
fun onTypeAliasDecl(node: MiniTypeAliasDecl) {}
|
||||||
|
|
||||||
fun onBlock(node: MiniBlock) {}
|
fun onBlock(node: MiniBlock) {}
|
||||||
fun onIdentifier(node: MiniIdentifier) {}
|
fun onIdentifier(node: MiniIdentifier) {}
|
||||||
@@ -456,6 +512,41 @@ class MiniAstBuilder : MiniAstSink {
|
|||||||
lastDoc = null
|
lastDoc = null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override fun onTypeAliasDecl(node: MiniTypeAliasDecl) {
|
||||||
|
val attach = node.copy(doc = node.doc ?: lastDoc)
|
||||||
|
val currentClass = classStack.lastOrNull()
|
||||||
|
if (currentClass != null && functionDepth == 0) {
|
||||||
|
val member = MiniMemberTypeAliasDecl(
|
||||||
|
range = attach.range,
|
||||||
|
name = attach.name,
|
||||||
|
typeParams = attach.typeParams,
|
||||||
|
target = attach.target,
|
||||||
|
doc = attach.doc,
|
||||||
|
nameStart = attach.nameStart,
|
||||||
|
isStatic = attach.isStatic,
|
||||||
|
isExtern = attach.isExtern
|
||||||
|
)
|
||||||
|
val existing = currentClass.members.filterIsInstance<MiniMemberTypeAliasDecl>()
|
||||||
|
.find { it.name == attach.name && it.nameStart == attach.nameStart }
|
||||||
|
val updatedMembers = if (existing != null) {
|
||||||
|
currentClass.members.map { if (it === existing) member else it }
|
||||||
|
} else {
|
||||||
|
currentClass.members + member
|
||||||
|
}
|
||||||
|
classStack.removeLast()
|
||||||
|
classStack.addLast(currentClass.copy(members = updatedMembers))
|
||||||
|
} else {
|
||||||
|
val existing = currentScript?.declarations?.find { it.name == attach.name && it.nameStart == attach.nameStart }
|
||||||
|
if (existing != null) {
|
||||||
|
val idx = currentScript?.declarations?.indexOf(existing) ?: -1
|
||||||
|
if (idx >= 0) currentScript?.declarations?.set(idx, attach)
|
||||||
|
} else {
|
||||||
|
currentScript?.declarations?.add(attach)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
lastDoc = null
|
||||||
|
}
|
||||||
|
|
||||||
override fun onBlock(node: MiniBlock) {
|
override fun onBlock(node: MiniBlock) {
|
||||||
blocks.addLast(node)
|
blocks.addLast(node)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* 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.ArgsDeclaration
|
||||||
|
import net.sergeych.lyng.Pos
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.bytecode.CmdFunction
|
||||||
|
|
||||||
|
class LambdaFnRef(
|
||||||
|
valueFn: suspend (Scope) -> ObjRecord,
|
||||||
|
val bytecodeFn: CmdFunction?,
|
||||||
|
val paramSlotPlan: Map<String, Int>,
|
||||||
|
val argsDeclaration: ArgsDeclaration?,
|
||||||
|
val preferredThisType: String?,
|
||||||
|
val wrapAsExtensionCallable: Boolean,
|
||||||
|
val returnLabels: Set<String>,
|
||||||
|
val pos: Pos,
|
||||||
|
) : ValueFnRef(valueFn)
|
||||||
@@ -65,7 +65,8 @@ open class Obj {
|
|||||||
fun isInstanceOf(someClass: Obj) = someClass === objClass ||
|
fun isInstanceOf(someClass: Obj) = someClass === objClass ||
|
||||||
objClass.allParentsSet.contains(someClass) ||
|
objClass.allParentsSet.contains(someClass) ||
|
||||||
someClass == rootObjectType ||
|
someClass == rootObjectType ||
|
||||||
(someClass is ObjClass && objClass.allImplementingNames.contains(someClass.className))
|
(someClass is ObjClass && (objClass.allImplementingNames.contains(someClass.className) ||
|
||||||
|
objClass.className == someClass.className))
|
||||||
|
|
||||||
fun isInstanceOf(className: String) =
|
fun isInstanceOf(className: String) =
|
||||||
objClass.mro.any { it.className == className } ||
|
objClass.mro.any { it.className == className } ||
|
||||||
@@ -113,7 +114,7 @@ open class Obj {
|
|||||||
if (rec != null && !rec.isAbstract) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
|
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
@@ -124,23 +125,13 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Extensions in scope
|
// 2. Root object fallback
|
||||||
val extension = scope.findExtension(objClass, name)
|
|
||||||
if (extension != null) {
|
|
||||||
if (extension.type == ObjRecord.Type.Property) {
|
|
||||||
if (args.isEmpty()) return (extension.value as ObjProperty).callGetter(scope, this, extension.declaringClass)
|
|
||||||
} else if (extension.type != ObjRecord.Type.Delegated) {
|
|
||||||
return extension.value.invoke(scope, this, args)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Root object fallback
|
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") {
|
if (cls.className == "Obj") {
|
||||||
cls.members[name]?.let { rec ->
|
cls.members[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
|
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
@@ -151,6 +142,15 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
scope.findExtension(objClass, name)?.let { ext ->
|
||||||
|
if (ext.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) {
|
||||||
|
return (ext.value as ObjProperty).callGetter(scope, this, ext.declaringClass)
|
||||||
|
}
|
||||||
|
} else if (ext.type != ObjRecord.Type.Delegated) {
|
||||||
|
return ext.value.invoke(scope, this, args, ext.declaringClass)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
return onNotFoundResult?.invoke()
|
return onNotFoundResult?.invoke()
|
||||||
?: scope.raiseError(
|
?: scope.raiseError(
|
||||||
@@ -181,7 +181,7 @@ open class Obj {
|
|||||||
|
|
||||||
open suspend fun equals(scope: Scope, other: Obj): Boolean {
|
open suspend fun equals(scope: Scope, other: Obj): Boolean {
|
||||||
if (other === this) return true
|
if (other === this) return true
|
||||||
val m = objClass.getInstanceMemberOrNull("equals") ?: scope.findExtension(objClass, "equals")
|
val m = objClass.getInstanceMemberOrNull("equals")
|
||||||
if (m != null) {
|
if (m != null) {
|
||||||
return invokeInstanceMethod(scope, "equals", Arguments(other)).toBool()
|
return invokeInstanceMethod(scope, "equals", Arguments(other)).toBool()
|
||||||
}
|
}
|
||||||
@@ -375,7 +375,7 @@ open class Obj {
|
|||||||
* to generate it as 'this = this + other', reassigning its variable
|
* to generate it as 'this = this + other', reassigning its variable
|
||||||
*/
|
*/
|
||||||
open suspend fun plusAssign(scope: Scope, other: Obj): Obj? {
|
open suspend fun plusAssign(scope: Scope, other: Obj): Obj? {
|
||||||
val m = objClass.getInstanceMemberOrNull("plusAssign") ?: scope.findExtension(objClass, "plusAssign")
|
val m = objClass.getInstanceMemberOrNull("plusAssign")
|
||||||
return if (m != null) {
|
return if (m != null) {
|
||||||
invokeInstanceMethod(scope, "plusAssign", Arguments(other))
|
invokeInstanceMethod(scope, "plusAssign", Arguments(other))
|
||||||
} else null
|
} else null
|
||||||
@@ -385,28 +385,28 @@ open class Obj {
|
|||||||
* `-=` operations, see [plusAssign]
|
* `-=` operations, see [plusAssign]
|
||||||
*/
|
*/
|
||||||
open suspend fun minusAssign(scope: Scope, other: Obj): Obj? {
|
open suspend fun minusAssign(scope: Scope, other: Obj): Obj? {
|
||||||
val m = objClass.getInstanceMemberOrNull("minusAssign") ?: scope.findExtension(objClass, "minusAssign")
|
val m = objClass.getInstanceMemberOrNull("minusAssign")
|
||||||
return if (m != null) {
|
return if (m != null) {
|
||||||
invokeInstanceMethod(scope, "minusAssign", Arguments(other))
|
invokeInstanceMethod(scope, "minusAssign", Arguments(other))
|
||||||
} else null
|
} else null
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun mulAssign(scope: Scope, other: Obj): Obj? {
|
open suspend fun mulAssign(scope: Scope, other: Obj): Obj? {
|
||||||
val m = objClass.getInstanceMemberOrNull("mulAssign") ?: scope.findExtension(objClass, "mulAssign")
|
val m = objClass.getInstanceMemberOrNull("mulAssign")
|
||||||
return if (m != null) {
|
return if (m != null) {
|
||||||
invokeInstanceMethod(scope, "mulAssign", Arguments(other))
|
invokeInstanceMethod(scope, "mulAssign", Arguments(other))
|
||||||
} else null
|
} else null
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun divAssign(scope: Scope, other: Obj): Obj? {
|
open suspend fun divAssign(scope: Scope, other: Obj): Obj? {
|
||||||
val m = objClass.getInstanceMemberOrNull("divAssign") ?: scope.findExtension(objClass, "divAssign")
|
val m = objClass.getInstanceMemberOrNull("divAssign")
|
||||||
return if (m != null) {
|
return if (m != null) {
|
||||||
invokeInstanceMethod(scope, "divAssign", Arguments(other))
|
invokeInstanceMethod(scope, "divAssign", Arguments(other))
|
||||||
} else null
|
} else null
|
||||||
}
|
}
|
||||||
|
|
||||||
open suspend fun modAssign(scope: Scope, other: Obj): Obj? {
|
open suspend fun modAssign(scope: Scope, other: Obj): Obj? {
|
||||||
val m = objClass.getInstanceMemberOrNull("modAssign") ?: scope.findExtension(objClass, "modAssign")
|
val m = objClass.getInstanceMemberOrNull("modAssign")
|
||||||
return if (m != null) {
|
return if (m != null) {
|
||||||
invokeInstanceMethod(scope, "modAssign", Arguments(other))
|
invokeInstanceMethod(scope, "modAssign", Arguments(other))
|
||||||
} else null
|
} else null
|
||||||
@@ -429,10 +429,10 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert Lyng object to its Kotlin counterpart
|
* Convert a Lyng object to its Kotlin counterpart
|
||||||
*/
|
*/
|
||||||
open suspend fun toKotlin(scope: Scope): Any? {
|
open suspend fun toKotlin(scope: Scope): Any? {
|
||||||
return toString()
|
return toString(scope).value
|
||||||
}
|
}
|
||||||
|
|
||||||
fun willMutate(scope: Scope) {
|
fun willMutate(scope: Scope) {
|
||||||
@@ -467,22 +467,13 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Extensions
|
// 2. Root fallback
|
||||||
val extension = scope.findExtension(objClass, name)
|
|
||||||
if (extension != null) {
|
|
||||||
val resolved = resolveRecord(scope, extension, name, extension.declaringClass)
|
|
||||||
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
|
||||||
return resolved.copy(value = resolved.value.invoke(scope, this, Arguments.EMPTY, extension.declaringClass))
|
|
||||||
return resolved
|
|
||||||
}
|
|
||||||
|
|
||||||
// 3. Root fallback
|
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") {
|
if (cls.className == "Obj") {
|
||||||
cls.members[name]?.let { rec ->
|
cls.members[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
val resolved = resolveRecord(scope, rec, name, decl)
|
val resolved = resolveRecord(scope, rec, name, decl)
|
||||||
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
||||||
@@ -491,6 +482,14 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
scope.findExtension(objClass, name)?.let { ext ->
|
||||||
|
return if (ext.type == ObjRecord.Type.Property) {
|
||||||
|
val prop = ext.value as ObjProperty
|
||||||
|
ObjRecord(prop.callGetter(scope, this, ext.declaringClass), isMutable = false)
|
||||||
|
} else {
|
||||||
|
ext.copy(value = ext.value.invoke(scope, this, Arguments.EMPTY, ext.declaringClass))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
scope.raiseError(
|
scope.raiseError(
|
||||||
"no such field: $name on ${objClass.className}. Considered order: ${objClass.renderLinearization(true)}"
|
"no such field: $name on ${objClass.className}. Considered order: ${objClass.renderLinearization(true)}"
|
||||||
@@ -501,17 +500,23 @@ open class Obj {
|
|||||||
if (obj.type == ObjRecord.Type.Delegated) {
|
if (obj.type == ObjRecord.Type.Delegated) {
|
||||||
val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
val th = if (this === ObjVoid) ObjNull else this
|
val th = if (this === ObjVoid) ObjNull else this
|
||||||
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(th, ObjString(name)), onNotFoundResult = {
|
val getValueRec = del.objClass.getInstanceMemberOrNull("getValue")
|
||||||
// If getValue not found, return a wrapper that calls invoke
|
if (getValueRec == null || getValueRec.declaringClass?.className == "Delegate") {
|
||||||
object : Statement() {
|
val wrapper = object : Statement() {
|
||||||
override val pos: Pos = Pos.builtIn
|
override val pos: Pos = Pos.builtIn
|
||||||
|
|
||||||
override suspend fun execute(s: Scope): Obj {
|
override suspend fun execute(s: Scope): Obj {
|
||||||
val th2 = if (s.thisObj === ObjVoid) ObjNull else s.thisObj
|
val th2 = if (s.thisObj === ObjVoid) ObjNull else s.thisObj
|
||||||
val allArgs = (listOf(th2, ObjString(name)) + s.args.list).toTypedArray()
|
val allArgs = (listOf(th2, ObjString(name)) + s.args.list).toTypedArray()
|
||||||
return del.invokeInstanceMethod(s, "invoke", Arguments(*allArgs))
|
return del.invokeInstanceMethod(s, "invoke", Arguments(*allArgs))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
return obj.copy(
|
||||||
|
value = wrapper,
|
||||||
|
type = ObjRecord.Type.Other
|
||||||
|
)
|
||||||
|
}
|
||||||
|
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(th, ObjString(name)))
|
||||||
return obj.copy(
|
return obj.copy(
|
||||||
value = res,
|
value = res,
|
||||||
type = ObjRecord.Type.Other
|
type = ObjRecord.Type.Other
|
||||||
@@ -526,7 +531,7 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
// Check visibility for non-property members here if they weren't checked before
|
// Check visibility for non-property members here if they weren't checked before
|
||||||
if (!canAccessMember(obj.visibility, decl, caller))
|
if (!canAccessMember(obj.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
||||||
return obj
|
return obj
|
||||||
}
|
}
|
||||||
@@ -554,11 +559,7 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 2. Extensions
|
// 2. Root fallback
|
||||||
if (field == null) {
|
|
||||||
field = scope.findExtension(objClass, name)
|
|
||||||
}
|
|
||||||
// 3. Root fallback
|
|
||||||
if (field == null) {
|
if (field == null) {
|
||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") {
|
if (cls.className == "Obj") {
|
||||||
@@ -574,7 +575,7 @@ open class Obj {
|
|||||||
|
|
||||||
val decl = field.declaringClass
|
val decl = field.declaringClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(field.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(field.effectiveWriteVisibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't assign field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't assign field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
||||||
if (field.type == ObjRecord.Type.Delegated) {
|
if (field.type == ObjRecord.Type.Delegated) {
|
||||||
val del = field.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
val del = field.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
@@ -605,16 +606,19 @@ open class Obj {
|
|||||||
scope.raiseNotImplemented()
|
scope.raiseNotImplemented()
|
||||||
}
|
}
|
||||||
|
|
||||||
suspend fun invoke(scope: Scope, thisObj: Obj, args: Arguments, declaringClass: ObjClass? = null): Obj =
|
suspend fun invoke(scope: Scope, thisObj: Obj, args: Arguments, declaringClass: ObjClass? = null): Obj {
|
||||||
if (PerfFlags.SCOPE_POOL)
|
val usePool = PerfFlags.SCOPE_POOL && this !is Statement
|
||||||
|
return if (usePool) {
|
||||||
scope.withChildFrame(args, newThisObj = thisObj) { child ->
|
scope.withChildFrame(args, newThisObj = thisObj) { child ->
|
||||||
if (declaringClass != null) child.currentClassCtx = declaringClass
|
if (declaringClass != null) child.currentClassCtx = declaringClass
|
||||||
callOn(child)
|
callOn(child)
|
||||||
}
|
}
|
||||||
else
|
} else {
|
||||||
callOn(scope.createChildScope(scope.pos, args = args, newThisObj = thisObj).also {
|
callOn(scope.createChildScope(scope.pos, args = args, newThisObj = thisObj).also {
|
||||||
if (declaringClass != null) it.currentClassCtx = declaringClass
|
if (declaringClass != null) it.currentClassCtx = declaringClass
|
||||||
})
|
})
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
suspend fun invoke(scope: Scope, thisObj: Obj, vararg args: Obj): Obj =
|
suspend fun invoke(scope: Scope, thisObj: Obj, vararg args: Obj): Obj =
|
||||||
callOn(
|
callOn(
|
||||||
@@ -721,7 +725,8 @@ open class Obj {
|
|||||||
(thisObj as? ObjInstance)?.let {
|
(thisObj as? ObjInstance)?.let {
|
||||||
body.callOn(ApplyScope(this, it.instanceScope))
|
body.callOn(ApplyScope(this, it.instanceScope))
|
||||||
} ?: run {
|
} ?: run {
|
||||||
body.callOn(this)
|
val appliedScope = createChildScope(newThisObj = thisObj)
|
||||||
|
body.callOn(ApplyScope(this, appliedScope))
|
||||||
}
|
}
|
||||||
thisObj
|
thisObj
|
||||||
}
|
}
|
||||||
@@ -760,6 +765,38 @@ open class Obj {
|
|||||||
) {
|
) {
|
||||||
thisObj.toJson(this).toString().toObj()
|
thisObj.toJson(this).toString().toObj()
|
||||||
}
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "clamp",
|
||||||
|
doc = "Clamps this value within the specified range. If the value is outside the range, it is set to the nearest boundary. Respects inclusive/exclusive range ends.",
|
||||||
|
params = listOf(ParamDoc("range")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
val range = requiredArg<ObjRange>(0)
|
||||||
|
|
||||||
|
var result = thisObj
|
||||||
|
if (range.start != null && !range.start.isNull) {
|
||||||
|
if (result.compareTo(this, range.start) < 0) {
|
||||||
|
result = range.start
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (range.end != null && !range.end.isNull) {
|
||||||
|
val cmp = range.end.compareTo(this, result)
|
||||||
|
if (range.isEndInclusive) {
|
||||||
|
if (cmp < 0) result = range.end
|
||||||
|
} else {
|
||||||
|
if (cmp <= 0) {
|
||||||
|
if (range.end is ObjInt) {
|
||||||
|
result = ObjInt.of(range.end.value - 1)
|
||||||
|
} else if (range.end is ObjChar) {
|
||||||
|
result = ObjChar((range.end.value.code - 1).toChar())
|
||||||
|
} else {
|
||||||
|
result = range.end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,16 +17,24 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import kotlinx.serialization.json.JsonElement
|
||||||
|
import kotlinx.serialization.json.JsonObject
|
||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.*
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
// Simple id generator for class identities (not thread-safe; fine for scripts)
|
// Simple id generator for class identities (not thread-safe; fine for scripts)
|
||||||
private object ClassIdGen { var c: Long = 1L; fun nextId(): Long = c++ }
|
private object ClassIdGen { var c: Long = 1L; fun nextId(): Long = c++ }
|
||||||
|
|
||||||
val ObjClassType by lazy {
|
val ObjClassType by lazy {
|
||||||
ObjClass("Class").apply {
|
object : ObjClass("Class") {
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
val name = decoder.decodeObject(scope, ObjString.type, null) as ObjString
|
||||||
|
return scope.resolveQualifiedIdentifier(name.value)
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
addPropertyDoc(
|
addPropertyDoc(
|
||||||
name = "className",
|
name = "className",
|
||||||
doc = "Full name of this class including package if available.",
|
doc = "Full name of this class including package if available.",
|
||||||
@@ -106,33 +114,38 @@ open class ObjClass(
|
|||||||
val classId: Long = ClassIdGen.nextId()
|
val classId: Long = ClassIdGen.nextId()
|
||||||
var layoutVersion: Int = 0
|
var layoutVersion: Int = 0
|
||||||
|
|
||||||
private val mangledNameCache = mutableMapOf<String, String>()
|
fun mangledName(name: String): String = "$className::$name"
|
||||||
fun mangledName(name: String): String = mangledNameCache.getOrPut(name) { "$className::$name" }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map of public member names to their effective storage keys in instanceScope.objects.
|
* Map of public member names to their effective storage keys in instanceScope.objects.
|
||||||
* This is pre-calculated to avoid MRO traversal and string concatenation during common access.
|
* Cached and invalidated by layoutVersion to reflect newly added members.
|
||||||
*/
|
*/
|
||||||
val publicMemberResolution: Map<String, String> by lazy {
|
private var publicMemberResolutionVersion: Int = -1
|
||||||
val res = mutableMapOf<String, String>()
|
private var publicMemberResolutionCache: Map<String, String> = emptyMap()
|
||||||
// Traverse MRO in REVERSED order so that child classes override parent classes in the map.
|
val publicMemberResolution: Map<String, String>
|
||||||
for (cls in mro.reversed()) {
|
get() {
|
||||||
if (cls.className == "Obj") continue
|
if (publicMemberResolutionVersion == layoutVersion) return publicMemberResolutionCache
|
||||||
for ((name, rec) in cls.members) {
|
val res = mutableMapOf<String, String>()
|
||||||
if (rec.visibility == Visibility.Public) {
|
// Traverse MRO in REVERSED order so that child classes override parent classes in the map.
|
||||||
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
for (cls in mro.reversed()) {
|
||||||
res[name] = key
|
if (cls.className == "Obj") continue
|
||||||
}
|
for ((name, rec) in cls.members) {
|
||||||
}
|
if (rec.visibility == Visibility.Public) {
|
||||||
cls.classScope?.objects?.forEach { (name, rec) ->
|
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
if (rec.visibility == Visibility.Public && (rec.value is Statement || rec.type == ObjRecord.Type.Delegated)) {
|
res[name] = key
|
||||||
val key = if (rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
}
|
||||||
res[name] = key
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.visibility == Visibility.Public && (rec.value is Statement || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
val key = if (rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
res[name] = key
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
publicMemberResolutionCache = res
|
||||||
|
publicMemberResolutionVersion = layoutVersion
|
||||||
|
return res
|
||||||
}
|
}
|
||||||
res
|
|
||||||
}
|
|
||||||
|
|
||||||
val classNameObj by lazy { ObjString(className) }
|
val classNameObj by lazy { ObjString(className) }
|
||||||
|
|
||||||
@@ -259,6 +272,250 @@ open class ObjClass(
|
|||||||
*/
|
*/
|
||||||
internal val members = mutableMapOf<String, ObjRecord>()
|
internal val members = mutableMapOf<String, ObjRecord>()
|
||||||
|
|
||||||
|
internal data class FieldSlot(val slot: Int, val record: ObjRecord)
|
||||||
|
internal data class ResolvedMember(val record: ObjRecord, val declaringClass: ObjClass)
|
||||||
|
internal data class MethodSlot(val slot: Int, val record: ObjRecord)
|
||||||
|
private var nextFieldId: Int = 0
|
||||||
|
private var nextMethodId: Int = 0
|
||||||
|
private val fieldIdMap: MutableMap<String, Int> = mutableMapOf()
|
||||||
|
private val methodIdMap: MutableMap<String, Int> = mutableMapOf()
|
||||||
|
private var methodIdSeeded: Boolean = false
|
||||||
|
private var fieldSlotLayoutVersion: Int = -1
|
||||||
|
private var fieldSlotMap: Map<String, FieldSlot> = emptyMap()
|
||||||
|
private var fieldSlotCount: Int = 0
|
||||||
|
private var instanceMemberLayoutVersion: Int = -1
|
||||||
|
private var instanceMemberCache: Map<String, ResolvedMember> = emptyMap()
|
||||||
|
private var methodSlotLayoutVersion: Int = -1
|
||||||
|
private var methodSlotMap: Map<String, MethodSlot> = emptyMap()
|
||||||
|
private var methodSlotCount: Int = 0
|
||||||
|
|
||||||
|
private fun ensureFieldSlots(): Map<String, FieldSlot> {
|
||||||
|
if (fieldSlotLayoutVersion == layoutVersion) return fieldSlotMap
|
||||||
|
val res = mutableMapOf<String, FieldSlot>()
|
||||||
|
var maxId = -1
|
||||||
|
for (cls in mro) {
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
|
||||||
|
val key = cls.mangledName(name)
|
||||||
|
if (res.containsKey(key)) continue
|
||||||
|
val fieldId = rec.fieldId ?: cls.assignFieldId(name, rec)
|
||||||
|
res[key] = FieldSlot(fieldId, rec)
|
||||||
|
if (fieldId > maxId) maxId = fieldId
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.isAbstract) return@forEach
|
||||||
|
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) return@forEach
|
||||||
|
val key = cls.mangledName(name)
|
||||||
|
if (res.containsKey(key)) return@forEach
|
||||||
|
val fieldId = rec.fieldId ?: cls.assignFieldId(name, rec)
|
||||||
|
res[key] = FieldSlot(fieldId, rec)
|
||||||
|
if (fieldId > maxId) maxId = fieldId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fieldSlotMap = res
|
||||||
|
fieldSlotCount = maxId + 1
|
||||||
|
fieldSlotLayoutVersion = layoutVersion
|
||||||
|
return fieldSlotMap
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ensureInstanceMemberCache(): Map<String, ResolvedMember> {
|
||||||
|
if (instanceMemberLayoutVersion == layoutVersion) return instanceMemberCache
|
||||||
|
val res = mutableMapOf<String, ResolvedMember>()
|
||||||
|
for (cls in mro) {
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (res.containsKey(name)) continue
|
||||||
|
val decl = rec.declaringClass ?: cls
|
||||||
|
res[name] = ResolvedMember(rec, decl)
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.isAbstract) return@forEach
|
||||||
|
if (res.containsKey(name)) return@forEach
|
||||||
|
val decl = rec.declaringClass ?: cls
|
||||||
|
res[name] = ResolvedMember(rec, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
instanceMemberCache = res
|
||||||
|
instanceMemberLayoutVersion = layoutVersion
|
||||||
|
return instanceMemberCache
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ensureMethodSlots(): Map<String, MethodSlot> {
|
||||||
|
if (methodSlotLayoutVersion == layoutVersion) return methodSlotMap
|
||||||
|
val res = mutableMapOf<String, MethodSlot>()
|
||||||
|
var maxId = -1
|
||||||
|
for (cls in mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (rec.value !is Statement &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated &&
|
||||||
|
rec.type != ObjRecord.Type.Fun &&
|
||||||
|
rec.type != ObjRecord.Type.Property) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
if (res.containsKey(key)) continue
|
||||||
|
val methodId = rec.methodId ?: cls.assignMethodId(name, rec)
|
||||||
|
res[key] = MethodSlot(methodId, rec)
|
||||||
|
if (methodId > maxId) maxId = methodId
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.isAbstract) return@forEach
|
||||||
|
if (rec.value !is Statement &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated &&
|
||||||
|
rec.type != ObjRecord.Type.Property) return@forEach
|
||||||
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
if (res.containsKey(key)) return@forEach
|
||||||
|
val methodId = rec.methodId ?: cls.assignMethodId(name, rec)
|
||||||
|
res[key] = MethodSlot(methodId, rec)
|
||||||
|
if (methodId > maxId) maxId = methodId
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodSlotMap = res
|
||||||
|
methodSlotCount = maxId + 1
|
||||||
|
methodSlotLayoutVersion = layoutVersion
|
||||||
|
return methodSlotMap
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldSlotCount(): Int {
|
||||||
|
ensureFieldSlots()
|
||||||
|
return fieldSlotCount
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldSlotForKey(key: String): FieldSlot? {
|
||||||
|
ensureFieldSlots()
|
||||||
|
return fieldSlotMap[key]
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldSlotMap(): Map<String, FieldSlot> = ensureFieldSlots()
|
||||||
|
internal fun fieldRecordForId(fieldId: Int): ObjRecord? {
|
||||||
|
ensureFieldSlots()
|
||||||
|
return fieldSlotMap.values.firstOrNull { it.slot == fieldId }?.record
|
||||||
|
}
|
||||||
|
internal fun resolveInstanceMember(name: String): ResolvedMember? = ensureInstanceMemberCache()[name]
|
||||||
|
internal fun methodSlotCount(): Int {
|
||||||
|
ensureMethodSlots()
|
||||||
|
return methodSlotCount
|
||||||
|
}
|
||||||
|
internal fun methodSlotForKey(key: String): MethodSlot? {
|
||||||
|
ensureMethodSlots()
|
||||||
|
return methodSlotMap[key]
|
||||||
|
}
|
||||||
|
internal fun methodSlotMap(): Map<String, MethodSlot> = ensureMethodSlots()
|
||||||
|
internal fun methodRecordForId(methodId: Int): ObjRecord? {
|
||||||
|
ensureMethodSlots()
|
||||||
|
methodSlotMap.values.firstOrNull { it.slot == methodId }?.record?.let { return it }
|
||||||
|
// Fallback to scanning the MRO in case a parent method id was added after slot cache creation.
|
||||||
|
for (cls in mro) {
|
||||||
|
for ((_, rec) in cls.members) {
|
||||||
|
if (rec.methodId == methodId) return rec
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (_, rec) ->
|
||||||
|
if (rec.methodId == methodId) return rec
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun instanceFieldIdMap(): Map<String, Int> {
|
||||||
|
val result = mutableMapOf<String, Int>()
|
||||||
|
for (cls in mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
|
||||||
|
if (rec.visibility == Visibility.Private) continue
|
||||||
|
val id = rec.fieldId ?: cls.assignFieldId(name, rec)
|
||||||
|
if (!result.containsKey(name)) result[name] = id
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.isAbstract) return@forEach
|
||||||
|
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) return@forEach
|
||||||
|
if (rec.visibility == Visibility.Private) return@forEach
|
||||||
|
val id = rec.fieldId ?: cls.assignFieldId(name, rec)
|
||||||
|
if (!result.containsKey(name)) result[name] = id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun instanceMethodIdMap(includeAbstract: Boolean = false): Map<String, Int> {
|
||||||
|
val result = mutableMapOf<String, Int>()
|
||||||
|
for (cls in mro) {
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (!includeAbstract && rec.isAbstract) continue
|
||||||
|
if (rec.visibility == Visibility.Private) continue
|
||||||
|
if (rec.type != ObjRecord.Type.Fun &&
|
||||||
|
rec.type != ObjRecord.Type.Property &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated) continue
|
||||||
|
val id = rec.methodId ?: cls.assignMethodId(name, rec)
|
||||||
|
if (!result.containsKey(name)) result[name] = id
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (!includeAbstract && rec.isAbstract) return@forEach
|
||||||
|
if (rec.visibility == Visibility.Private) return@forEach
|
||||||
|
if (rec.type != ObjRecord.Type.Fun &&
|
||||||
|
rec.type != ObjRecord.Type.Property &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated) return@forEach
|
||||||
|
val id = rec.methodId ?: cls.assignMethodId(name, rec)
|
||||||
|
if (!result.containsKey(name)) result[name] = id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun assignFieldId(name: String, rec: ObjRecord): Int {
|
||||||
|
val existingId = rec.fieldId
|
||||||
|
if (existingId != null) {
|
||||||
|
fieldIdMap[name] = existingId
|
||||||
|
return existingId
|
||||||
|
}
|
||||||
|
val id = fieldIdMap.getOrPut(name) { nextFieldId++ }
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun assignMethodId(name: String, rec: ObjRecord): Int {
|
||||||
|
ensureMethodIdSeeded()
|
||||||
|
val existingId = rec.methodId
|
||||||
|
if (existingId != null) {
|
||||||
|
methodIdMap[name] = existingId
|
||||||
|
return existingId
|
||||||
|
}
|
||||||
|
val id = methodIdMap.getOrPut(name) { nextMethodId++ }
|
||||||
|
return id
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ensureMethodIdSeeded() {
|
||||||
|
if (methodIdSeeded) return
|
||||||
|
var maxId = -1
|
||||||
|
for (cls in mroParents) {
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.type != ObjRecord.Type.Fun &&
|
||||||
|
rec.type != ObjRecord.Type.Property &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated
|
||||||
|
) continue
|
||||||
|
val id = rec.methodId ?: cls.assignMethodId(name, rec)
|
||||||
|
if (!methodIdMap.containsKey(name)) methodIdMap[name] = id
|
||||||
|
if (id > maxId) maxId = id
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.type != ObjRecord.Type.Fun &&
|
||||||
|
rec.type != ObjRecord.Type.Property &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated
|
||||||
|
) return@forEach
|
||||||
|
val id = rec.methodId ?: cls.assignMethodId(name, rec)
|
||||||
|
if (!methodIdMap.containsKey(name)) methodIdMap[name] = id
|
||||||
|
if (id > maxId) maxId = id
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (nextMethodId <= maxId) {
|
||||||
|
nextMethodId = maxId + 1
|
||||||
|
}
|
||||||
|
methodIdSeeded = true
|
||||||
|
}
|
||||||
|
|
||||||
override fun toString(): String = className
|
override fun toString(): String = className
|
||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int = if (other === this) 0 else -1
|
override suspend fun compareTo(scope: Scope, other: Obj): Int = if (other === this) 0 else -1
|
||||||
@@ -276,8 +533,8 @@ open class ObjClass(
|
|||||||
for (cls in mro) {
|
for (cls in mro) {
|
||||||
// 1) members-defined methods and fields
|
// 1) members-defined methods and fields
|
||||||
for ((k, v) in cls.members) {
|
for ((k, v) in cls.members) {
|
||||||
if (!v.isAbstract && (v.value is Statement || v.type == ObjRecord.Type.Delegated || v.type == ObjRecord.Type.Field)) {
|
if (!v.isAbstract && (v.value is Statement || v.type == ObjRecord.Type.Delegated || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.ConstructorField)) {
|
||||||
val key = if (v.visibility == Visibility.Private || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.Delegated) cls.mangledName(k) else k
|
val key = if (v.visibility == Visibility.Private || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.ConstructorField || v.type == ObjRecord.Type.Delegated) cls.mangledName(k) else k
|
||||||
if (!res.containsKey(key)) {
|
if (!res.containsKey(key)) {
|
||||||
res[key] = v
|
res[key] = v
|
||||||
}
|
}
|
||||||
@@ -319,12 +576,47 @@ open class ObjClass(
|
|||||||
val stableParent = classScope ?: scope.parent
|
val stableParent = classScope ?: scope.parent
|
||||||
instance.instanceScope = Scope(stableParent, scope.args, scope.pos, instance)
|
instance.instanceScope = Scope(stableParent, scope.args, scope.pos, instance)
|
||||||
instance.instanceScope.currentClassCtx = null
|
instance.instanceScope.currentClassCtx = null
|
||||||
|
val fieldSlots = fieldSlotMap()
|
||||||
|
if (fieldSlots.isNotEmpty()) {
|
||||||
|
instance.initFieldSlots(fieldSlotCount())
|
||||||
|
}
|
||||||
|
val methodSlots = methodSlotMap()
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
instance.initMethodSlots(methodSlotCount())
|
||||||
|
}
|
||||||
// Expose instance methods (and other callable members) directly in the instance scope for fast lookup
|
// Expose instance methods (and other callable members) directly in the instance scope for fast lookup
|
||||||
// This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
|
// This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
|
||||||
|
|
||||||
instance.instanceScope.objects.putAll(templateMethods)
|
instance.instanceScope.objects.putAll(templateMethods)
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
for ((key, rec) in templateMethods) {
|
||||||
|
val slot = methodSlots[key]
|
||||||
|
if (slot != null) {
|
||||||
|
instance.setMethodSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (p in templateOthers) {
|
for (p in templateOthers) {
|
||||||
instance.instanceScope.objects[p.first] = p.second.copy()
|
val rec = p.second.copy()
|
||||||
|
instance.instanceScope.objects[p.first] = rec
|
||||||
|
val slot = fieldSlots[p.first]
|
||||||
|
if (slot != null) {
|
||||||
|
instance.setFieldSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
val mSlot = methodSlots[p.first]
|
||||||
|
if (mSlot != null) {
|
||||||
|
instance.setMethodSlotRecord(mSlot.slot, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
for ((_, mSlot) in methodSlots) {
|
||||||
|
val idx = mSlot.slot
|
||||||
|
if (idx >= 0 && idx < instance.methodSlots.size && instance.methodSlots[idx] == null) {
|
||||||
|
instance.setMethodSlotRecord(idx, mSlot.record)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
@@ -409,6 +701,10 @@ open class ObjClass(
|
|||||||
if (rec != null) {
|
if (rec != null) {
|
||||||
val mangled = c.mangledName(p.name)
|
val mangled = c.mangledName(p.name)
|
||||||
instance.instanceScope.objects[mangled] = rec
|
instance.instanceScope.objects[mangled] = rec
|
||||||
|
val slot = instance.objClass.fieldSlotForKey(mangled)
|
||||||
|
if (slot != null) {
|
||||||
|
instance.setFieldSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -451,17 +747,21 @@ open class ObjClass(
|
|||||||
isAbstract: Boolean = false,
|
isAbstract: Boolean = false,
|
||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
|
isTransient: Boolean = false,
|
||||||
type: ObjRecord.Type = ObjRecord.Type.Field,
|
type: ObjRecord.Type = ObjRecord.Type.Field,
|
||||||
|
fieldId: Int? = null,
|
||||||
|
methodId: Int? = 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 actualOverride = false
|
||||||
if (pos != Pos.builtIn) {
|
if (pos != Pos.builtIn) {
|
||||||
// Only consider TRUE instance members from ancestors for overrides
|
// Only consider TRUE instance members from ancestors for overrides
|
||||||
val existing = getInstanceMemberOrNull(name, includeAbstract = true, includeStatic = false)
|
existing = getInstanceMemberOrNull(name, includeAbstract = true, includeStatic = false)
|
||||||
var actualOverride = false
|
|
||||||
if (existing != null && existing.declaringClass != this) {
|
if (existing != null && existing.declaringClass != this) {
|
||||||
// If the existing member is private in the ancestor, it's not visible for overriding.
|
// If the existing member is private in the ancestor, it's not visible for overriding.
|
||||||
// It should be treated as a new member in this class.
|
// It should be treated as a new member in this class.
|
||||||
if (!existing.visibility.isPublic && !canAccessMember(existing.visibility, existing.declaringClass, this)) {
|
if (!existing.visibility.isPublic && !canAccessMember(existing.visibility, existing.declaringClass, this, name)) {
|
||||||
// It's effectively not there for us, so actualOverride remains false
|
// It's effectively not there for us, so actualOverride remains false
|
||||||
} else {
|
} else {
|
||||||
actualOverride = true
|
actualOverride = true
|
||||||
@@ -488,13 +788,67 @@ open class ObjClass(
|
|||||||
throw ScriptError(pos, "$name is already defined in $objClass")
|
throw ScriptError(pos, "$name is already defined in $objClass")
|
||||||
|
|
||||||
// Install/override in this class
|
// Install/override in this class
|
||||||
|
val effectiveFieldId = if (type == ObjRecord.Type.Field || type == ObjRecord.Type.ConstructorField) {
|
||||||
|
fieldId ?: fieldIdMap[name]?.let { it } ?: run {
|
||||||
|
fieldIdMap[name] = nextFieldId
|
||||||
|
nextFieldId++
|
||||||
|
fieldIdMap[name]!!
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
fieldId
|
||||||
|
}
|
||||||
|
val inheritedCandidate = run {
|
||||||
|
var found: ObjRecord? = null
|
||||||
|
for (cls in mro) {
|
||||||
|
if (cls === this) continue
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
cls.members[name]?.let {
|
||||||
|
found = it
|
||||||
|
return@run found
|
||||||
|
}
|
||||||
|
}
|
||||||
|
found
|
||||||
|
}
|
||||||
|
if (type == ObjRecord.Type.Fun ||
|
||||||
|
type == ObjRecord.Type.Property ||
|
||||||
|
type == ObjRecord.Type.Delegated
|
||||||
|
) {
|
||||||
|
ensureMethodIdSeeded()
|
||||||
|
}
|
||||||
|
val effectiveMethodId = if (type == ObjRecord.Type.Fun ||
|
||||||
|
type == ObjRecord.Type.Property ||
|
||||||
|
type == ObjRecord.Type.Delegated
|
||||||
|
) {
|
||||||
|
val inherited = if (actualOverride) {
|
||||||
|
existing?.methodId
|
||||||
|
} else {
|
||||||
|
val candidate = inheritedCandidate
|
||||||
|
if (candidate != null &&
|
||||||
|
candidate.declaringClass != this &&
|
||||||
|
(candidate.visibility.isPublic || canAccessMember(candidate.visibility, candidate.declaringClass, this, name))
|
||||||
|
) {
|
||||||
|
candidate.methodId
|
||||||
|
} else null
|
||||||
|
}
|
||||||
|
methodId ?: inherited ?: methodIdMap[name]?.let { it } ?: run {
|
||||||
|
methodIdMap[name] = nextMethodId
|
||||||
|
nextMethodId++
|
||||||
|
methodIdMap[name]!!
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
methodId
|
||||||
|
}
|
||||||
val rec = ObjRecord(
|
val rec = ObjRecord(
|
||||||
initialValue, isMutable, visibility, writeVisibility,
|
initialValue, isMutable, visibility, writeVisibility,
|
||||||
declaringClass = declaringClass,
|
declaringClass = declaringClass,
|
||||||
isAbstract = isAbstract,
|
isAbstract = isAbstract,
|
||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride,
|
isOverride = isOverride,
|
||||||
type = type
|
isTransient = isTransient,
|
||||||
|
type = type,
|
||||||
|
memberName = name,
|
||||||
|
fieldId = effectiveFieldId,
|
||||||
|
methodId = effectiveMethodId
|
||||||
)
|
)
|
||||||
members[name] = rec
|
members[name] = rec
|
||||||
// Structural change: bump layout version for PIC invalidation
|
// Structural change: bump layout version for PIC invalidation
|
||||||
@@ -514,13 +868,53 @@ open class ObjClass(
|
|||||||
visibility: Visibility = Visibility.Public,
|
visibility: Visibility = Visibility.Public,
|
||||||
writeVisibility: Visibility? = null,
|
writeVisibility: Visibility? = null,
|
||||||
pos: Pos = Pos.builtIn,
|
pos: Pos = Pos.builtIn,
|
||||||
type: ObjRecord.Type = ObjRecord.Type.Field
|
isTransient: Boolean = false,
|
||||||
|
type: ObjRecord.Type = ObjRecord.Type.Field,
|
||||||
|
fieldId: Int? = null,
|
||||||
|
methodId: Int? = null
|
||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
initClassScope()
|
initClassScope()
|
||||||
val existing = classScope!!.objects[name]
|
val existing = classScope!!.objects[name]
|
||||||
if (existing != null)
|
if (existing != null)
|
||||||
throw ScriptError(pos, "$name is already defined in $objClass or one of its supertypes")
|
throw ScriptError(pos, "$name is already defined in $objClass or one of its supertypes")
|
||||||
val rec = classScope!!.addItem(name, isMutable, initialValue, visibility, writeVisibility, recordType = type)
|
val effectiveFieldId = if (type == ObjRecord.Type.Field || type == ObjRecord.Type.ConstructorField) {
|
||||||
|
fieldId ?: fieldIdMap[name]?.let { it } ?: run {
|
||||||
|
fieldIdMap[name] = nextFieldId
|
||||||
|
nextFieldId++
|
||||||
|
fieldIdMap[name]!!
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
fieldId
|
||||||
|
}
|
||||||
|
if (type == ObjRecord.Type.Fun ||
|
||||||
|
type == ObjRecord.Type.Property ||
|
||||||
|
type == ObjRecord.Type.Delegated
|
||||||
|
) {
|
||||||
|
ensureMethodIdSeeded()
|
||||||
|
}
|
||||||
|
val effectiveMethodId = if (type == ObjRecord.Type.Fun ||
|
||||||
|
type == ObjRecord.Type.Property ||
|
||||||
|
type == ObjRecord.Type.Delegated
|
||||||
|
) {
|
||||||
|
methodId ?: methodIdMap[name]?.let { it } ?: run {
|
||||||
|
methodIdMap[name] = nextMethodId
|
||||||
|
nextMethodId++
|
||||||
|
methodIdMap[name]!!
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
methodId
|
||||||
|
}
|
||||||
|
val rec = classScope!!.addItem(
|
||||||
|
name,
|
||||||
|
isMutable,
|
||||||
|
initialValue,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
recordType = type,
|
||||||
|
isTransient = isTransient,
|
||||||
|
fieldId = effectiveFieldId,
|
||||||
|
methodId = effectiveMethodId
|
||||||
|
)
|
||||||
// Structural change: bump layout version for PIC invalidation
|
// Structural change: bump layout version for PIC invalidation
|
||||||
layoutVersion += 1
|
layoutVersion += 1
|
||||||
return rec
|
return rec
|
||||||
@@ -536,13 +930,15 @@ open class ObjClass(
|
|||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
pos: Pos = Pos.builtIn,
|
pos: Pos = Pos.builtIn,
|
||||||
|
methodId: Int? = null,
|
||||||
code: (suspend Scope.() -> Obj)? = null
|
code: (suspend Scope.() -> Obj)? = null
|
||||||
) {
|
) {
|
||||||
val stmt = code?.let { statement { it() } } ?: ObjNull
|
val stmt = code?.let { statement { it() } } ?: ObjNull
|
||||||
createField(
|
createField(
|
||||||
name, stmt, isMutable, visibility, writeVisibility, pos, declaringClass,
|
name, stmt, isMutable, visibility, writeVisibility, pos, declaringClass,
|
||||||
isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
|
isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
|
||||||
type = ObjRecord.Type.Fun
|
type = ObjRecord.Type.Fun,
|
||||||
|
methodId = methodId
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -559,7 +955,8 @@ open class ObjClass(
|
|||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
pos: Pos = Pos.builtIn,
|
pos: Pos = Pos.builtIn,
|
||||||
prop: ObjProperty? = null
|
prop: ObjProperty? = null,
|
||||||
|
methodId: Int? = null
|
||||||
) {
|
) {
|
||||||
val g = getter?.let { statement { it() } }
|
val g = getter?.let { statement { it() } }
|
||||||
val s = setter?.let { statement { it(requiredArg(0)); ObjVoid } }
|
val s = setter?.let { statement { it(requiredArg(0)); ObjVoid } }
|
||||||
@@ -567,7 +964,8 @@ open class ObjClass(
|
|||||||
createField(
|
createField(
|
||||||
name, finalProp, false, visibility, writeVisibility, pos, declaringClass,
|
name, finalProp, false, visibility, writeVisibility, pos, declaringClass,
|
||||||
isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
|
isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
|
||||||
type = ObjRecord.Type.Property
|
type = ObjRecord.Type.Property,
|
||||||
|
methodId = methodId
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -707,9 +1105,23 @@ open class ObjClass(
|
|||||||
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
if (isAnonymous) scope.raiseError("Cannot serialize anonymous class")
|
||||||
|
encoder.encodeObject(scope, classNameObj, ObjString.type.lynonType())
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toJson(scope: Scope): JsonElement {
|
||||||
|
val result = mutableMapOf<String, JsonElement>()
|
||||||
|
result["__class_name"] = classNameObj.toJson(scope)
|
||||||
|
classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.type.serializable && rec.visibility.isPublic && !rec.isTransient) {
|
||||||
|
result[name] = rec.value.toJson(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
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()
|
scope.raiseNotImplemented()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,293 @@
|
|||||||
|
/*
|
||||||
|
* 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.datetime.*
|
||||||
|
import kotlinx.serialization.json.JsonElement
|
||||||
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.Statement
|
||||||
|
import net.sergeych.lyng.miniast.addClassFnDoc
|
||||||
|
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 ObjDateTime(val instant: Instant, val timeZone: TimeZone) : Obj() {
|
||||||
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
|
val localDateTime: LocalDateTime by lazy {
|
||||||
|
instant.toLocalDateTime(timeZone)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return localDateTime.toString() + timeZone.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
|
for (cls in objClass.mro) {
|
||||||
|
val rec = cls.members[name]
|
||||||
|
if (rec != null) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
val prop = rec.value as? ObjProperty
|
||||||
|
?: (rec.value as? Statement)?.execute(scope) as? ObjProperty
|
||||||
|
if (prop != null) {
|
||||||
|
return ObjRecord(prop.callGetter(scope, this, rec.declaringClass ?: cls), rec.isMutable)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (rec.type == ObjRecord.Type.Fun || rec.value is Statement) {
|
||||||
|
val s = rec.value as Statement
|
||||||
|
return ObjRecord(net.sergeych.lyng.statement { s.execute(this.createChildScope(newThisObj = this@ObjDateTime)) }, rec.isMutable)
|
||||||
|
}
|
||||||
|
return resolveRecord(scope, rec, name, rec.declaringClass ?: cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return super.readField(scope, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun plus(scope: Scope, other: Obj): Obj {
|
||||||
|
return when (other) {
|
||||||
|
is ObjDuration -> ObjDateTime(instant + other.duration, timeZone)
|
||||||
|
else -> super.plus(scope, other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun minus(scope: Scope, other: Obj): Obj {
|
||||||
|
return when (other) {
|
||||||
|
is ObjDuration -> ObjDateTime(instant - other.duration, timeZone)
|
||||||
|
is ObjDateTime -> ObjDuration(instant - other.instant)
|
||||||
|
is ObjInstant -> ObjDuration(instant - other.instant)
|
||||||
|
else -> super.minus(scope, other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
if (other is ObjDateTime) {
|
||||||
|
return instant.compareTo(other.instant)
|
||||||
|
}
|
||||||
|
if (other is ObjInstant) {
|
||||||
|
return instant.compareTo(other.instant)
|
||||||
|
}
|
||||||
|
return super.compareTo(scope, other)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toKotlin(scope: Scope): Any {
|
||||||
|
return localDateTime
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return instant.hashCode() xor timeZone.hashCode()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (other !is ObjDateTime) return false
|
||||||
|
return instant == other.instant && timeZone == other.timeZone
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun lynonType(): LynonType = LynonType.Other
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
encoder.encodeCached(this) {
|
||||||
|
encodeAny(scope, ObjInstant(instant))
|
||||||
|
encodeCached(timeZone.id) {
|
||||||
|
encodeBinaryData(timeZone.id.encodeToByteArray())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toJson(scope: Scope): JsonElement = JsonPrimitive(toRFC3339())
|
||||||
|
|
||||||
|
fun toRFC3339(): String {
|
||||||
|
val s = localDateTime.toString()
|
||||||
|
val tz = if (timeZone == TimeZone.UTC) "Z" else timeZone.id
|
||||||
|
return if (tz.startsWith("+") || tz.startsWith("-") || tz == "Z") s + tz else s + "[" + tz + "]"
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = object : ObjClass("DateTime") {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val args = scope.args
|
||||||
|
return when (val a0 = args.list.getOrNull(0)) {
|
||||||
|
is ObjInstant -> {
|
||||||
|
val tz = when (val a1 = args.list.getOrNull(1)) {
|
||||||
|
null -> TimeZone.currentSystemDefault()
|
||||||
|
is ObjString -> TimeZone.of(a1.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a1.value.toInt()).asTimeZone()
|
||||||
|
else -> scope.raiseIllegalArgument("invalid timezone: $a1")
|
||||||
|
}
|
||||||
|
ObjDateTime(a0.instant, tz)
|
||||||
|
}
|
||||||
|
|
||||||
|
is ObjInt -> {
|
||||||
|
// DateTime(year, month, day, hour=0, minute=0, second=0, timeZone="UTC")
|
||||||
|
val year = a0.value.toInt()
|
||||||
|
val month = args.list.getOrNull(1)?.toInt() ?: scope.raiseIllegalArgument("month is required")
|
||||||
|
val day = args.list.getOrNull(2)?.toInt() ?: scope.raiseIllegalArgument("day is required")
|
||||||
|
val hour = args.list.getOrNull(3)?.toInt() ?: 0
|
||||||
|
val minute = args.list.getOrNull(4)?.toInt() ?: 0
|
||||||
|
val second = args.list.getOrNull(5)?.toInt() ?: 0
|
||||||
|
val tz = when (val a6 = args.list.getOrNull(6)) {
|
||||||
|
null -> TimeZone.UTC
|
||||||
|
is ObjString -> TimeZone.of(a6.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a6.value.toInt()).asTimeZone()
|
||||||
|
else -> scope.raiseIllegalArgument("invalid timezone: $a6")
|
||||||
|
}
|
||||||
|
val ldt = LocalDateTime(year, month, day, hour, minute, second)
|
||||||
|
ObjDateTime(ldt.toInstant(tz), tz)
|
||||||
|
}
|
||||||
|
|
||||||
|
is ObjString -> {
|
||||||
|
val instant = Instant.parse(a0.value)
|
||||||
|
ObjDateTime(instant, TimeZone.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> scope.raiseIllegalArgument("can't construct DateTime from ${args.inspect(scope)}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
return decoder.decodeCached {
|
||||||
|
val instant = (decoder.decodeAny(scope) as ObjInstant).instant
|
||||||
|
val tzId = decoder.decodeCached { decoder.unpackBinaryData().decodeToString() }
|
||||||
|
ObjDateTime(instant, TimeZone.of(tzId))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
|
addPropertyDoc("year", "The year component.", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.year.toObj() })
|
||||||
|
addPropertyDoc("month", "The month component (1..12).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.monthNumber.toObj() })
|
||||||
|
addPropertyDoc("dayOfMonth", "The day of month component.", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.dayOfMonth.toObj() })
|
||||||
|
addPropertyDoc("day", "Alias to dayOfMonth.", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.dayOfMonth.toObj() })
|
||||||
|
addPropertyDoc("hour", "The hour component (0..23).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.hour.toObj() })
|
||||||
|
addPropertyDoc("minute", "The minute component (0..59).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.minute.toObj() })
|
||||||
|
addPropertyDoc("second", "The second component (0..59).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.second.toObj() })
|
||||||
|
addPropertyDoc("dayOfWeek", "The day of week (1=Monday, 7=Sunday).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.dayOfWeek.isoDayNumber.toObj() })
|
||||||
|
addPropertyDoc("timeZone", "The time zone ID (e.g. 'Z', '+02:00', 'Europe/Prague').", type("lyng.String"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().timeZone.id.toObj() })
|
||||||
|
|
||||||
|
addFnDoc("toInstant", "Convert this localized date time back to an absolute Instant.", returns = type("lyng.Instant"), moduleName = "lyng.time") {
|
||||||
|
ObjInstant(thisAs<ObjDateTime>().instant)
|
||||||
|
}
|
||||||
|
addFnDoc("toEpochSeconds", "Return the number of full seconds since the Unix epoch (UTC).", returns = type("lyng.Int"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().instant.epochSeconds.toObj()
|
||||||
|
}
|
||||||
|
addFnDoc("toRFC3339", "Return the RFC3339 string representation of this date time, including its timezone offset.", returns = type("lyng.String"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().toRFC3339().toObj()
|
||||||
|
}
|
||||||
|
addFnDoc("toSortableString", "Alias to toRFC3339.", returns = type("lyng.String"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().toRFC3339().toObj()
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc("toEpochMilliseconds", "Return the number of milliseconds since the Unix epoch (UTC).", returns = type("lyng.Int"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().instant.toEpochMilliseconds().toObj()
|
||||||
|
}
|
||||||
|
addFnDoc("toTimeZone", "Return a new DateTime representing the same instant but in a different time zone. " +
|
||||||
|
"Accepts a timezone ID string (e.g., 'UTC', '+02:00') or an integer offset in seconds.",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("tz", type = type("lyng.Any"))),
|
||||||
|
returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
val tz = when (val a = args.list.getOrNull(0)) {
|
||||||
|
is ObjString -> TimeZone.of(a.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a.value.toInt()).asTimeZone()
|
||||||
|
else -> raiseIllegalArgument("invalid timezone: $a")
|
||||||
|
}
|
||||||
|
ObjDateTime(thisAs<ObjDateTime>().instant, tz)
|
||||||
|
}
|
||||||
|
addFnDoc("toUTC", "Shortcut to convert this date time to the UTC time zone.", returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
ObjDateTime(thisAs<ObjDateTime>().instant, TimeZone.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc("addMonths", "Return a new DateTime with the specified number of months added (or subtracted if negative). " +
|
||||||
|
"Normalizes the day of month if necessary (e.g., Jan 31 + 1 month = Feb 28/29).",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("months", type = type("lyng.Int"))),
|
||||||
|
returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
val n = args.list.getOrNull(0)?.toInt() ?: 0
|
||||||
|
val res = thisAs<ObjDateTime>().instant.plus(n, DateTimeUnit.MONTH, thisAs<ObjDateTime>().timeZone)
|
||||||
|
ObjDateTime(res, thisAs<ObjDateTime>().timeZone)
|
||||||
|
}
|
||||||
|
addFnDoc("addYears", "Return a new DateTime with the specified number of years added (or subtracted if negative).",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("years", type = type("lyng.Int"))),
|
||||||
|
returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
val n = args.list.getOrNull(0)?.toInt() ?: 0
|
||||||
|
val res = thisAs<ObjDateTime>().instant.plus(n, DateTimeUnit.YEAR, thisAs<ObjDateTime>().timeZone)
|
||||||
|
ObjDateTime(res, thisAs<ObjDateTime>().timeZone)
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFn("now") {
|
||||||
|
val tz = when (val a = args.list.getOrNull(0)) {
|
||||||
|
null -> TimeZone.currentSystemDefault()
|
||||||
|
is ObjString -> TimeZone.of(a.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a.value.toInt()).asTimeZone()
|
||||||
|
else -> raiseIllegalArgument("invalid timezone: $a")
|
||||||
|
}
|
||||||
|
ObjDateTime(kotlin.time.Clock.System.now(), tz)
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc("parseRFC3339",
|
||||||
|
"Parse an RFC3339 string into a DateTime object. " +
|
||||||
|
"Note: if the string does not specify a timezone, UTC is assumed.",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("string", type = type("lyng.String"))),
|
||||||
|
returns = type("lyng.DateTime"),
|
||||||
|
moduleName = "lyng.time") {
|
||||||
|
val s = (args.firstAndOnly() as ObjString).value
|
||||||
|
// kotlinx-datetime's Instant.parse handles RFC3339
|
||||||
|
// But we want to preserve the offset if present for DateTime.
|
||||||
|
// However, Instant.parse("...") always gives an Instant.
|
||||||
|
// If we want the specific offset from the string, we might need a more complex parse.
|
||||||
|
// For now, let's stick to parsing it as Instant and converting to UTC or specified TZ.
|
||||||
|
// Actually, if the string has an offset, Instant.parse handles it but returns UTC instant.
|
||||||
|
|
||||||
|
// Let's try to detect if there is an offset in the string.
|
||||||
|
// If not, use UTC.
|
||||||
|
val instant = Instant.parse(s)
|
||||||
|
|
||||||
|
// RFC3339 can have Z or +/-HH:mm or +/-HHmm or +/-HH
|
||||||
|
val tz = try {
|
||||||
|
if (s.endsWith("Z", ignoreCase = true)) {
|
||||||
|
TimeZone.of("Z")
|
||||||
|
} else {
|
||||||
|
// Look for the last + or - which is likely the start of the offset
|
||||||
|
val lastPlus = s.lastIndexOf('+')
|
||||||
|
val lastMinus = s.lastIndexOf('-')
|
||||||
|
val offsetStart = if (lastPlus > lastMinus) lastPlus else lastMinus
|
||||||
|
if (offsetStart > s.lastIndexOf('T')) {
|
||||||
|
// Likely an offset
|
||||||
|
val offsetStr = s.substring(offsetStart)
|
||||||
|
TimeZone.of(offsetStr)
|
||||||
|
} else {
|
||||||
|
TimeZone.UTC
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
TimeZone.UTC
|
||||||
|
}
|
||||||
|
|
||||||
|
ObjDateTime(instant, tz)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,7 +18,6 @@
|
|||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.lyng.Arguments
|
import net.sergeych.lyng.Arguments
|
||||||
import net.sergeych.lyng.ClosureScope
|
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.Statement
|
import net.sergeych.lyng.Statement
|
||||||
|
|
||||||
@@ -63,7 +62,7 @@ open class ObjDynamic(var readCallback: Statement? = null, var writeCallback: St
|
|||||||
* with method invocation which is implemented separately in [invokeInstanceMethod] below.
|
* with method invocation which is implemented separately in [invokeInstanceMethod] below.
|
||||||
*/
|
*/
|
||||||
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
val execBase = builderScope?.let { ClosureScope(scope, it) } ?: scope
|
val execBase = builderScope?.let { scope.applyClosure(it) } ?: scope
|
||||||
return readCallback?.execute(execBase.createChildScope(Arguments(ObjString(name))))?.let {
|
return readCallback?.execute(execBase.createChildScope(Arguments(ObjString(name))))?.let {
|
||||||
if (writeCallback != null)
|
if (writeCallback != null)
|
||||||
it.asMutable
|
it.asMutable
|
||||||
@@ -83,26 +82,26 @@ open class ObjDynamic(var readCallback: Statement? = null, var writeCallback: St
|
|||||||
args: Arguments,
|
args: Arguments,
|
||||||
onNotFoundResult: (suspend () -> Obj?)?
|
onNotFoundResult: (suspend () -> Obj?)?
|
||||||
): Obj {
|
): Obj {
|
||||||
val execBase = builderScope?.let { ClosureScope(scope, it) } ?: scope
|
val execBase = builderScope?.let { scope.applyClosure(it) } ?: scope
|
||||||
val over = readCallback?.execute(execBase.createChildScope(Arguments(ObjString(name))))
|
val over = readCallback?.execute(execBase.createChildScope(Arguments(ObjString(name))))
|
||||||
return over?.invoke(scope, scope.thisObj, args)
|
return over?.invoke(scope, scope.thisObj, args)
|
||||||
?: super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
?: super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
||||||
val execBase = builderScope?.let { ClosureScope(scope, it) } ?: scope
|
val execBase = builderScope?.let { scope.applyClosure(it) } ?: scope
|
||||||
writeCallback?.execute(execBase.createChildScope(Arguments(ObjString(name), newValue)))
|
writeCallback?.execute(execBase.createChildScope(Arguments(ObjString(name), newValue)))
|
||||||
?: super.writeField(scope, name, newValue)
|
?: super.writeField(scope, name, newValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun getAt(scope: Scope, index: Obj): Obj {
|
override suspend fun getAt(scope: Scope, index: Obj): Obj {
|
||||||
val execBase = builderScope?.let { ClosureScope(scope, it) } ?: scope
|
val execBase = builderScope?.let { scope.applyClosure(it) } ?: scope
|
||||||
return readCallback?.execute(execBase.createChildScope(Arguments(index)))
|
return readCallback?.execute(execBase.createChildScope(Arguments(index)))
|
||||||
?: super.getAt(scope, index)
|
?: super.getAt(scope, index)
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
override suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) {
|
||||||
val execBase = builderScope?.let { ClosureScope(scope, it) } ?: scope
|
val execBase = builderScope?.let { scope.applyClosure(it) } ?: scope
|
||||||
writeCallback?.execute(execBase.createChildScope(Arguments(index, newValue)))
|
writeCallback?.execute(execBase.createChildScope(Arguments(index, newValue)))
|
||||||
?: super.putAt(scope, index, newValue)
|
?: super.putAt(scope, index, newValue)
|
||||||
}
|
}
|
||||||
@@ -122,8 +121,12 @@ open class ObjDynamic(var readCallback: Statement? = null, var writeCallback: St
|
|||||||
}
|
}
|
||||||
|
|
||||||
val type = object : ObjClass("Delegate") {}.apply {
|
val type = object : ObjClass("Delegate") {}.apply {
|
||||||
|
addFn("getValue") { raiseError("Delegate.getValue is not implemented") }
|
||||||
|
addFn("setValue") { raiseError("Delegate.setValue is not implemented") }
|
||||||
|
addFn("invoke") { raiseError("Delegate.invoke is not implemented") }
|
||||||
|
addFn("bind") { raiseError("Delegate.bind is not implemented") }
|
||||||
// addClassConst("IndexGetName", operatorGetName)
|
// addClassConst("IndexGetName", operatorGetName)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -92,34 +92,48 @@ open class ObjException(
|
|||||||
|
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
private var stackTraceCaptureDepth = 0
|
||||||
|
|
||||||
suspend fun captureStackTrace(scope: Scope): ObjList {
|
suspend fun captureStackTrace(scope: Scope): ObjList {
|
||||||
val result = ObjList()
|
val result = ObjList()
|
||||||
val maybeCls = scope.get("StackTraceEntry")?.value as? ObjClass
|
val nestedCapture = stackTraceCaptureDepth > 0
|
||||||
|
stackTraceCaptureDepth += 1
|
||||||
|
val maybeCls = if (nestedCapture) null else scope.get("StackTraceEntry")?.value as? ObjClass
|
||||||
var s: Scope? = scope
|
var s: Scope? = scope
|
||||||
var lastPos: Pos? = null
|
var lastPos: Pos? = null
|
||||||
while (s != null) {
|
try {
|
||||||
val pos = s.pos
|
while (s != null) {
|
||||||
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
val pos = s.pos
|
||||||
if( (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) ) {
|
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
||||||
if (maybeCls != null) {
|
if (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) {
|
||||||
result.list += maybeCls.callWithArgs(
|
val fallback =
|
||||||
scope,
|
ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${pos.currentLine}")
|
||||||
pos.source.objSourceName,
|
if (maybeCls != null) {
|
||||||
ObjInt(pos.line.toLong()),
|
try {
|
||||||
ObjInt(pos.column.toLong()),
|
result.list += maybeCls.callWithArgs(
|
||||||
ObjString(pos.currentLine)
|
scope,
|
||||||
)
|
pos.source.objSourceName,
|
||||||
} else {
|
ObjInt(pos.line.toLong()),
|
||||||
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
ObjInt(pos.column.toLong()),
|
||||||
result.list += ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${pos.currentLine}")
|
ObjString(pos.currentLine)
|
||||||
|
)
|
||||||
|
} catch (e: Throwable) {
|
||||||
|
// Fallback textual entry if StackTraceEntry fails to instantiate
|
||||||
|
result.list += fallback
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
||||||
|
result.list += fallback
|
||||||
|
}
|
||||||
|
lastPos = pos
|
||||||
}
|
}
|
||||||
lastPos = pos
|
|
||||||
}
|
}
|
||||||
|
s = s.parent
|
||||||
}
|
}
|
||||||
s = s.parent
|
return result
|
||||||
|
} finally {
|
||||||
|
stackTraceCaptureDepth -= 1
|
||||||
}
|
}
|
||||||
return result
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class ExceptionClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
class ExceptionClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
||||||
@@ -344,7 +358,11 @@ fun Obj.isLyngException(): Boolean = isInstanceOf("Exception")
|
|||||||
*/
|
*/
|
||||||
suspend fun Obj.getLyngExceptionMessage(scope: Scope? = null): String {
|
suspend fun Obj.getLyngExceptionMessage(scope: Scope? = null): String {
|
||||||
require(this.isLyngException())
|
require(this.isLyngException())
|
||||||
val s = scope ?: Script.newScope()
|
val s = scope ?: when (this) {
|
||||||
|
is ObjException -> this.scope
|
||||||
|
is ObjInstance -> this.instanceScope
|
||||||
|
else -> Script.newScope()
|
||||||
|
}
|
||||||
return invokeInstanceMethod(s, "message").toString(s).value
|
return invokeInstanceMethod(s, "message").toString(s).value
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -361,16 +379,25 @@ suspend fun Obj.getLyngExceptionMessage(scope: Scope? = null): String {
|
|||||||
*/
|
*/
|
||||||
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope? = null,showDetails:Boolean=true): String {
|
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope? = null,showDetails:Boolean=true): String {
|
||||||
require(this.isLyngException())
|
require(this.isLyngException())
|
||||||
val s = scope ?: Script.newScope()
|
val s = scope ?: when (this) {
|
||||||
|
is ObjException -> this.scope
|
||||||
|
is ObjInstance -> this.instanceScope
|
||||||
|
else -> Script.newScope()
|
||||||
|
}
|
||||||
val msg = getLyngExceptionMessage(s)
|
val msg = getLyngExceptionMessage(s)
|
||||||
val trace = getLyngExceptionStackTrace(s)
|
val trace = getLyngExceptionStackTrace(s)
|
||||||
var at = "unknown"
|
var at = "unknown"
|
||||||
// var firstLine = true
|
|
||||||
val stack = if (!trace.list.isEmpty()) {
|
val stack = if (!trace.list.isEmpty()) {
|
||||||
val first = trace.list[0]
|
val first = trace.list[0]
|
||||||
at = (first.readField(s, "at").value as ObjString).value
|
at = (first.readField(s, "at").value as ObjString).value
|
||||||
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
||||||
} else ""
|
} else {
|
||||||
|
val pos = s.pos
|
||||||
|
if (pos.source.fileName.isNotEmpty() && pos.currentLine.isNotEmpty()) {
|
||||||
|
at = "${pos.source.fileName}:${pos.line + 1}:${pos.column + 1}"
|
||||||
|
}
|
||||||
|
""
|
||||||
|
}
|
||||||
return "$at: $msg$stack"
|
return "$at: $msg$stack"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -396,9 +423,16 @@ suspend fun Obj.getLyngExceptionString(scope: Scope): String =
|
|||||||
* Rethrow this object as a Kotlin [ExecutionError] if it's an exception.
|
* Rethrow this object as a Kotlin [ExecutionError] if it's an exception.
|
||||||
*/
|
*/
|
||||||
suspend fun Obj.raiseAsExecutionError(scope: Scope? = null): Nothing {
|
suspend fun Obj.raiseAsExecutionError(scope: Scope? = null): Nothing {
|
||||||
if (this is ObjException) raise()
|
val sc = scope ?: when (this) {
|
||||||
val sc = scope ?: Script.newScope()
|
is ObjException -> this.scope
|
||||||
val msg = getLyngExceptionMessage(sc)
|
is ObjInstance -> this.instanceScope
|
||||||
val pos = (this as? ObjInstance)?.instanceScope?.pos ?: Pos.builtIn
|
else -> Script.newScope()
|
||||||
|
}
|
||||||
|
val msg = getLyngExceptionMessageWithStackTrace(sc)
|
||||||
|
val pos = when (this) {
|
||||||
|
is ObjException -> this.scope.pos
|
||||||
|
is ObjInstance -> this.instanceScope.pos
|
||||||
|
else -> Pos.builtIn
|
||||||
|
}
|
||||||
throw ExecutionError(this, pos, msg)
|
throw ExecutionError(this, pos, msg)
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,68 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* 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.Arguments
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
|
||||||
|
class ObjExtensionMethodCallable(
|
||||||
|
private val name: String,
|
||||||
|
private val target: Obj,
|
||||||
|
private val declaringClass: ObjClass? = null
|
||||||
|
) : Obj() {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val args = scope.args
|
||||||
|
if (args.isEmpty()) scope.raiseError("extension call $name requires receiver")
|
||||||
|
val receiver = args.first()
|
||||||
|
val rest = if (args.size <= 1) {
|
||||||
|
Arguments.EMPTY
|
||||||
|
} else {
|
||||||
|
Arguments(args.list.subList(1, args.size), args.tailBlockMode, args.named)
|
||||||
|
}
|
||||||
|
return target.invoke(scope, receiver, rest, declaringClass)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ObjExtensionPropertyGetterCallable(
|
||||||
|
private val name: String,
|
||||||
|
private val property: ObjProperty,
|
||||||
|
private val declaringClass: ObjClass? = null
|
||||||
|
) : Obj() {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val args = scope.args
|
||||||
|
if (args.isEmpty()) scope.raiseError("extension property $name requires receiver")
|
||||||
|
val receiver = args.first()
|
||||||
|
if (args.size > 1) scope.raiseError("extension property $name getter takes no arguments")
|
||||||
|
return property.callGetter(scope, receiver, declaringClass)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ObjExtensionPropertySetterCallable(
|
||||||
|
private val name: String,
|
||||||
|
private val property: ObjProperty,
|
||||||
|
private val declaringClass: ObjClass? = null
|
||||||
|
) : Obj() {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val args = scope.args
|
||||||
|
if (args.size < 2) scope.raiseError("extension property $name setter requires value")
|
||||||
|
val receiver = args[0]
|
||||||
|
val value = args[1]
|
||||||
|
property.callSetter(scope, receiver, value, declaringClass)
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -81,8 +81,8 @@ private fun createLyngFlowInput(scope: Scope, producer: Statement): ReceiveChann
|
|||||||
} catch (x: ScriptFlowIsNoMoreCollected) {
|
} catch (x: ScriptFlowIsNoMoreCollected) {
|
||||||
// premature flow closing, OK
|
// premature flow closing, OK
|
||||||
} catch (x: Exception) {
|
} catch (x: Exception) {
|
||||||
// Suppress stack traces in background producer to avoid noisy stderr during tests.
|
channel.close(x)
|
||||||
// If needed, consider routing to a logger in the future.
|
return@globalLaunch
|
||||||
}
|
}
|
||||||
channel.close()
|
channel.close()
|
||||||
}
|
}
|
||||||
@@ -107,9 +107,7 @@ class ObjFlow(val producer: Statement, val scope: Scope) : Obj() {
|
|||||||
) {
|
) {
|
||||||
val objFlow = thisAs<ObjFlow>()
|
val objFlow = thisAs<ObjFlow>()
|
||||||
ObjFlowIterator(statement {
|
ObjFlowIterator(statement {
|
||||||
objFlow.producer.execute(
|
objFlow.producer.execute(this)
|
||||||
ClosureScope(this, objFlow.scope)
|
|
||||||
)
|
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -137,6 +135,7 @@ class ObjFlowIterator(val producer: Statement) : Obj() {
|
|||||||
// cold start:
|
// cold start:
|
||||||
if (channel == null) channel = createLyngFlowInput(scope, producer)
|
if (channel == null) channel = createLyngFlowInput(scope, producer)
|
||||||
if (nextItem == null) nextItem = channel!!.receiveCatching()
|
if (nextItem == null) nextItem = channel!!.receiveCatching()
|
||||||
|
nextItem?.exceptionOrNull()?.let { throw it }
|
||||||
return ObjBool(nextItem!!.isSuccess)
|
return ObjBool(nextItem!!.isSuccess)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -19,10 +19,7 @@ package net.sergeych.lyng.obj
|
|||||||
|
|
||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonObject
|
import kotlinx.serialization.json.JsonObject
|
||||||
import net.sergeych.lyng.Arguments
|
import net.sergeych.lyng.*
|
||||||
import net.sergeych.lyng.Scope
|
|
||||||
import net.sergeych.lyng.Visibility
|
|
||||||
import net.sergeych.lyng.canAccessMember
|
|
||||||
import net.sergeych.lynon.LynonDecoder
|
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
|
||||||
@@ -30,6 +27,44 @@ import net.sergeych.lynon.LynonType
|
|||||||
class ObjInstance(override val objClass: ObjClass) : Obj() {
|
class ObjInstance(override val objClass: ObjClass) : Obj() {
|
||||||
|
|
||||||
internal lateinit var instanceScope: Scope
|
internal lateinit var instanceScope: Scope
|
||||||
|
internal var fieldSlots: Array<ObjRecord?> = emptyArray()
|
||||||
|
internal var methodSlots: Array<ObjRecord?> = emptyArray()
|
||||||
|
|
||||||
|
internal fun initFieldSlots(size: Int) {
|
||||||
|
fieldSlots = arrayOfNulls(size)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun setFieldSlotRecord(slot: Int, rec: ObjRecord) {
|
||||||
|
if (slot >= 0 && slot < fieldSlots.size) fieldSlots[slot] = rec
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun initMethodSlots(size: Int) {
|
||||||
|
methodSlots = arrayOfNulls(size)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun setMethodSlotRecord(slot: Int, rec: ObjRecord) {
|
||||||
|
if (slot >= 0 && slot < methodSlots.size) methodSlots[slot] = rec
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldRecordForKey(key: String): ObjRecord? {
|
||||||
|
val slot = objClass.fieldSlotForKey(key) ?: return null
|
||||||
|
val idx = slot.slot
|
||||||
|
return if (idx >= 0 && idx < fieldSlots.size) fieldSlots[idx] else null
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun methodRecordForKey(key: String): ObjRecord? {
|
||||||
|
val slot = objClass.methodSlotForKey(key) ?: return null
|
||||||
|
val idx = slot.slot
|
||||||
|
return if (idx >= 0 && idx < methodSlots.size) methodSlots[idx] else null
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldRecordForId(fieldId: Int): ObjRecord? {
|
||||||
|
return if (fieldId >= 0 && fieldId < fieldSlots.size) fieldSlots[fieldId] else null
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun methodRecordForId(methodId: Int): ObjRecord? {
|
||||||
|
return if (methodId >= 0 && methodId < methodSlots.size) methodSlots[methodId] else null
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
@@ -37,6 +72,16 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// Fast path for public members when outside any class context
|
// Fast path for public members when outside any class context
|
||||||
if (caller == null) {
|
if (caller == null) {
|
||||||
objClass.publicMemberResolution[name]?.let { key ->
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name) ?: objClass
|
||||||
|
return resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[key]?.let { rec ->
|
instanceScope.objects[key]?.let { rec ->
|
||||||
// Directly return fields to bypass resolveRecord overhead
|
// Directly return fields to bypass resolveRecord overhead
|
||||||
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
@@ -56,6 +101,16 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
// Check for private fields (stored in instanceScope)
|
// Check for private fields (stored in instanceScope)
|
||||||
val mangled = c.mangledName(name)
|
val mangled = c.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Private) {
|
if (rec.visibility == Visibility.Private) {
|
||||||
return resolveRecord(scope, rec, name, c)
|
return resolveRecord(scope, rec, name, c)
|
||||||
@@ -67,8 +122,18 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val mangled = cls.mangledName(name)
|
val mangled = cls.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.visibility, cls, caller, name)) {
|
||||||
|
return resolveRecord(scope, rec, name, cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.visibility, cls, caller, name)) {
|
||||||
|
return resolveRecord(scope, rec, name, cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.visibility, cls, caller)) {
|
if (canAccessMember(rec.visibility, cls, caller, name)) {
|
||||||
return resolveRecord(scope, rec, name, cls)
|
return resolveRecord(scope, rec, name, cls)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -77,8 +142,13 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// 2. Unmangled storage
|
// 2. Unmangled storage
|
||||||
instanceScope.objects[name]?.let { rec ->
|
instanceScope.objects[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
// Unmangled access is only allowed if it's public OR we are inside the same instance's method
|
if (canAccessMember(rec.visibility, decl, caller, name)) {
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.visibility, decl, caller)) {
|
return resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(name)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.visibility, decl, caller, name)) {
|
||||||
return resolveRecord(scope, rec, name, decl)
|
return resolveRecord(scope, rec, name, decl)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -100,9 +170,21 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
del = del ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
del = del ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
|
val getValueRec = del.objClass.getInstanceMemberOrNull("getValue")
|
||||||
|
if (getValueRec == null || getValueRec.declaringClass?.className == "Delegate") {
|
||||||
|
val wrapper = object : Statement() {
|
||||||
|
override val pos: Pos = Pos.builtIn
|
||||||
|
|
||||||
|
override suspend fun execute(s: Scope): Obj {
|
||||||
|
val th2 = if (s.thisObj === ObjVoid) ObjNull else s.thisObj
|
||||||
|
val allArgs = (listOf(th2, ObjString(name)) + s.args.list).toTypedArray()
|
||||||
|
return del.invokeInstanceMethod(s, "invoke", Arguments(*allArgs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return obj.copy(value = wrapper, type = ObjRecord.Type.Other)
|
||||||
|
}
|
||||||
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
||||||
obj.value = res
|
return obj.copy(value = res, type = ObjRecord.Type.Other)
|
||||||
return obj
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map member template to instance storage if applicable
|
// Map member template to instance storage if applicable
|
||||||
@@ -110,8 +192,13 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
val d = decl ?: obj.declaringClass
|
val d = decl ?: obj.declaringClass
|
||||||
if (d != null) {
|
if (d != null) {
|
||||||
val mangled = d.mangledName(name)
|
val mangled = d.mangledName(name)
|
||||||
instanceScope.objects[mangled]?.let {
|
val scoped = instanceScope.objects[mangled]
|
||||||
targetRec = it
|
if (scoped != null) {
|
||||||
|
targetRec = scoped
|
||||||
|
} else {
|
||||||
|
fieldRecordForKey(mangled)?.let {
|
||||||
|
targetRec = it
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (targetRec === obj) {
|
if (targetRec === obj) {
|
||||||
@@ -135,10 +222,29 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// Fast path for public members when outside any class context
|
// Fast path for public members when outside any class context
|
||||||
if (caller == null) {
|
if (caller == null) {
|
||||||
objClass.publicMemberResolution[name]?.let { key ->
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
||||||
|
// Skip property/delegated overhead if it's a plain mutable field
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && rec.isMutable && !rec.isAbstract) {
|
||||||
|
if (rec.value.assign(scope, newValue) == null)
|
||||||
|
rec.value = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateRecord(scope, rec, name, newValue, rec.declaringClass)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, rec.declaringClass)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[key]?.let { rec ->
|
instanceScope.objects[key]?.let { rec ->
|
||||||
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
||||||
// Skip property/delegated overhead if it's a plain mutable field
|
// Skip property/delegated overhead if it's a plain mutable field
|
||||||
if (rec.type == ObjRecord.Type.Field && rec.isMutable && !rec.isAbstract) {
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && rec.isMutable && !rec.isAbstract) {
|
||||||
if (rec.value.assign(scope, newValue) == null)
|
if (rec.value.assign(scope, newValue) == null)
|
||||||
rec.value = newValue
|
rec.value = newValue
|
||||||
return
|
return
|
||||||
@@ -161,6 +267,19 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
// Check for private fields (stored in instanceScope)
|
// Check for private fields (stored in instanceScope)
|
||||||
val mangled = c.mangledName(name)
|
val mangled = c.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Private) {
|
if (rec.visibility == Visibility.Private) {
|
||||||
updateRecord(scope, rec, name, newValue, c)
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
@@ -173,8 +292,21 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val mangled = cls.mangledName(name)
|
val mangled = cls.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, cls, caller, name)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, cls, caller, name) &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.effectiveWriteVisibility, cls, caller)) {
|
if (canAccessMember(rec.effectiveWriteVisibility, cls, caller, name)) {
|
||||||
updateRecord(scope, rec, name, newValue, cls)
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -184,7 +316,15 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// 2. Unmangled storage
|
// 2. Unmangled storage
|
||||||
instanceScope.objects[name]?.let { rec ->
|
instanceScope.objects[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.effectiveWriteVisibility, decl, caller)) {
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, decl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(name)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name) &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
updateRecord(scope, rec, name, newValue, decl)
|
updateRecord(scope, rec, name, newValue, decl)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -225,7 +365,27 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
|
|
||||||
// Fast path for public members when outside any class context
|
// Fast path for public members when outside any class context
|
||||||
if (caller == null) {
|
if (caller == null) {
|
||||||
|
objClass.members[name]?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
objClass.publicMemberResolution[name]?.let { key ->
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[key]?.let { rec ->
|
instanceScope.objects[key]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
@@ -242,6 +402,15 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// 0. Prefer private member of current class context
|
// 0. Prefer private member of current class context
|
||||||
caller?.let { c ->
|
caller?.let { c ->
|
||||||
val mangled = c.mangledName(name)
|
val mangled = c.mangledName(name)
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, c)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
@@ -262,50 +431,58 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. Walk MRO to find member, handling delegation
|
// Fast path for non-delegated instance methods in class context
|
||||||
for (cls in objClass.mro) {
|
methodRecordForKey(name)?.let { rec ->
|
||||||
if (cls.className == "Obj") break
|
if (!rec.isAbstract && rec.type == ObjRecord.Type.Fun) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name) ?: objClass
|
||||||
if (rec != null && !rec.isAbstract) {
|
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
|
||||||
val storageName = cls.mangledName(name)
|
|
||||||
val del = instanceScope[storageName]?.delegate ?: rec.delegate
|
|
||||||
?: scope.raiseError("Internal error: delegated member $name has no delegate (tried $storageName)")
|
|
||||||
|
|
||||||
// For delegated member, try 'invoke' first if it's a function-like call
|
|
||||||
val allArgs = (listOf(this, ObjString(name)) + args.list).toTypedArray()
|
|
||||||
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs), onNotFoundResult = {
|
|
||||||
// Fallback: property delegation (getValue then call result)
|
|
||||||
val propVal = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
|
||||||
propVal.invoke(scope, this, args, rec.declaringClass ?: cls)
|
|
||||||
})
|
|
||||||
}
|
|
||||||
val decl = rec.declaringClass ?: cls
|
|
||||||
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
||||||
if (!canAccessMember(rec.visibility, decl, effectiveCaller))
|
if (canAccessMember(rec.visibility, decl, effectiveCaller, name)) {
|
||||||
scope.raiseError(
|
return rec.value.invoke(instanceScope, this, args, decl)
|
||||||
ObjIllegalAccessException(
|
|
||||||
scope,
|
|
||||||
"can't invoke method $name (declared in ${decl.className})"
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
|
||||||
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
|
||||||
} else if (rec.type == ObjRecord.Type.Fun) {
|
|
||||||
return rec.value.invoke(
|
|
||||||
instanceScope,
|
|
||||||
this,
|
|
||||||
args,
|
|
||||||
decl
|
|
||||||
)
|
|
||||||
} else if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Argument) {
|
|
||||||
val resolved = readField(scope, name)
|
|
||||||
return resolved.value.invoke(scope, this, args, resolved.declaringClass)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// 1. Resolve instance member via cached MRO lookup, handling delegation
|
||||||
|
objClass.resolveInstanceMember(name)?.let { resolvedMember ->
|
||||||
|
val rec = resolvedMember.record
|
||||||
|
val decl = resolvedMember.declaringClass
|
||||||
|
if (rec.type == ObjRecord.Type.Delegated) {
|
||||||
|
val storageName = decl.mangledName(name)
|
||||||
|
val del = instanceScope[storageName]?.delegate ?: rec.delegate
|
||||||
|
?: scope.raiseError("Internal error: delegated member $name has no delegate (tried $storageName)")
|
||||||
|
|
||||||
|
// For delegated member, try 'invoke' first if it's a function-like call
|
||||||
|
val allArgs = (listOf(this, ObjString(name)) + args.list).toTypedArray()
|
||||||
|
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs), onNotFoundResult = {
|
||||||
|
// Fallback: property delegation (getValue then call result)
|
||||||
|
val propVal = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
||||||
|
propVal.invoke(scope, this, args, rec.declaringClass ?: decl)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
||||||
|
if (!canAccessMember(rec.visibility, decl, effectiveCaller, name))
|
||||||
|
scope.raiseError(
|
||||||
|
ObjIllegalAccessException(
|
||||||
|
scope,
|
||||||
|
"can't invoke method $name (declared in ${decl.className})"
|
||||||
|
)
|
||||||
|
)
|
||||||
|
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(
|
||||||
|
instanceScope,
|
||||||
|
this,
|
||||||
|
args,
|
||||||
|
decl
|
||||||
|
)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Argument) {
|
||||||
|
val resolved = readField(scope, name)
|
||||||
|
return resolved.value.invoke(scope, this, args, resolved.declaringClass)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// 2. Fall back to super (handles extensions and root fallback)
|
// 2. Fall back to super (handles extensions and root fallback)
|
||||||
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
||||||
}
|
}
|
||||||
@@ -339,7 +516,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// values, so we save size of the construction:
|
// values, so we save size of the construction:
|
||||||
|
|
||||||
// using objlist allow for some optimizations:
|
// using objlist allow for some optimizations:
|
||||||
val params = meta.params.map { readField(scope, it.name).value }
|
val params = meta.params.filter { !it.isTransient }.map { readField(scope, it.name).value }
|
||||||
encoder.encodeAnyList(scope, params)
|
encoder.encodeAnyList(scope, params)
|
||||||
val vars = serializingVars.values.map { it.value }
|
val vars = serializingVars.values.map { it.value }
|
||||||
if (vars.isNotEmpty()) {
|
if (vars.isNotEmpty()) {
|
||||||
@@ -358,8 +535,10 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
val result = mutableMapOf<String, JsonElement>()
|
val result = mutableMapOf<String, JsonElement>()
|
||||||
val meta = objClass.constructorMeta
|
val meta = objClass.constructorMeta
|
||||||
?: scope.raiseError("can't serialize non-serializable object (no constructor meta)")
|
?: scope.raiseError("can't serialize non-serializable object (no constructor meta)")
|
||||||
for (entry in meta.params)
|
for (entry in meta.params) {
|
||||||
result[entry.name] = readField(scope, entry.name).value.toJson(scope)
|
if (!entry.isTransient)
|
||||||
|
result[entry.name] = readField(scope, entry.name).value.toJson(scope)
|
||||||
|
}
|
||||||
for (i in serializingVars) {
|
for (i in serializingVars) {
|
||||||
// remove T:: prefix from the field name for JSON
|
// remove T:: prefix from the field name for JSON
|
||||||
val parts = i.key.split("::")
|
val parts = i.key.split("::")
|
||||||
@@ -378,7 +557,8 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
it.value.type.serializable &&
|
it.value.type.serializable &&
|
||||||
it.value.type == ObjRecord.Type.Field &&
|
it.value.type == ObjRecord.Type.Field &&
|
||||||
it.value.isMutable &&
|
it.value.isMutable &&
|
||||||
!metaParams.contains(it.key)
|
!metaParams.contains(it.key) &&
|
||||||
|
!it.value.isTransient
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -399,7 +579,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
|
|
||||||
protected val comparableVars: Map<String, ObjRecord> by lazy {
|
protected val comparableVars: Map<String, ObjRecord> by lazy {
|
||||||
instanceScope.objects.filter {
|
instanceScope.objects.filter {
|
||||||
it.value.type.comparable && (it.value.type != ObjRecord.Type.Field || it.value.isMutable)
|
it.value.type.comparable && (it.value.type != ObjRecord.Type.Field || it.value.isMutable) && !it.value.isTransient
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -433,7 +613,15 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
// Visibility: declaring class is the qualified ancestor for mangled storage
|
// Visibility: declaring class is the qualified ancestor for mangled storage
|
||||||
val decl = rec.declaringClass ?: startClass
|
val decl = rec.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
|
return instance.resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
instance.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
// Visibility: declaring class is the qualified ancestor for mangled storage
|
||||||
|
val decl = rec.declaringClass ?: startClass
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
return instance.resolveRecord(scope, rec, name, decl)
|
return instance.resolveRecord(scope, rec, name, decl)
|
||||||
}
|
}
|
||||||
@@ -442,7 +630,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope[name]?.let { rec ->
|
instance.instanceScope[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(
|
scope.raiseError(
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
@@ -456,7 +644,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
||||||
val decl = r.declaringClass ?: startClass
|
val decl = r.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(r.visibility, decl, caller))
|
if (!canAccessMember(r.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
|
|
||||||
return instance.resolveRecord(scope, r, name, decl)
|
return instance.resolveRecord(scope, r, name, decl)
|
||||||
@@ -468,7 +656,19 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope.objects[mangled]?.let { f ->
|
instance.instanceScope.objects[mangled]?.let { f ->
|
||||||
val decl = f.declaringClass ?: startClass
|
val decl = f.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
|
ObjIllegalAccessException(
|
||||||
|
scope,
|
||||||
|
"can't assign to field $name (declared in ${decl.className})"
|
||||||
|
).raise()
|
||||||
|
if (!f.isMutable && f.value !== ObjUnset) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
||||||
|
if (f.value.assign(scope, newValue) == null) f.value = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
|
instance.fieldRecordForKey(mangled)?.let { f ->
|
||||||
|
val decl = f.declaringClass ?: startClass
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
"can't assign to field $name (declared in ${decl.className})"
|
"can't assign to field $name (declared in ${decl.className})"
|
||||||
@@ -482,7 +682,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope[name]?.let { f ->
|
instance.instanceScope[name]?.let { f ->
|
||||||
val decl = f.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
val decl = f.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
"can't assign to field $name (declared in ${decl?.className ?: "?"})"
|
"can't assign to field $name (declared in ${decl?.className ?: "?"})"
|
||||||
@@ -495,7 +695,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
||||||
val decl = r.declaringClass ?: startClass
|
val decl = r.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(r.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(r.effectiveWriteVisibility, decl, caller, name))
|
||||||
ObjIllegalAccessException(scope, "can't assign to field $name (declared in ${decl.className})").raise()
|
ObjIllegalAccessException(scope, "can't assign to field $name (declared in ${decl.className})").raise()
|
||||||
if (!r.isMutable) scope.raiseError("can't assign to read-only field: $name")
|
if (!r.isMutable) scope.raiseError("can't assign to read-only field: $name")
|
||||||
if (r.value.assign(scope, newValue) == null) r.value = newValue
|
if (r.value.assign(scope, newValue) == null) r.value = newValue
|
||||||
@@ -511,12 +711,20 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
memberFromAncestor(name)?.let { rec ->
|
memberFromAncestor(name)?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: startClass
|
val decl = rec.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
|
||||||
val saved = instance.instanceScope.currentClassCtx
|
val saved = instance.instanceScope.currentClassCtx
|
||||||
instance.instanceScope.currentClassCtx = decl
|
instance.instanceScope.currentClassCtx = decl
|
||||||
try {
|
try {
|
||||||
return rec.value.invoke(instance.instanceScope, instance, args)
|
return when (rec.type) {
|
||||||
|
ObjRecord.Type.Property -> {
|
||||||
|
if (args.isEmpty()) (rec.value as ObjProperty).callGetter(scope, instance, decl)
|
||||||
|
else scope.raiseError("property $name cannot be called with arguments")
|
||||||
|
}
|
||||||
|
ObjRecord.Type.Fun, ObjRecord.Type.Delegated ->
|
||||||
|
rec.value.invoke(instance.instanceScope, instance, args)
|
||||||
|
else -> scope.raiseError("member $name is not callable")
|
||||||
|
}
|
||||||
} finally {
|
} finally {
|
||||||
instance.instanceScope.currentClassCtx = saved
|
instance.instanceScope.currentClassCtx = saved
|
||||||
}
|
}
|
||||||
@@ -526,7 +734,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope[name]?.let { rec ->
|
instance.instanceScope[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(
|
scope.raiseError(
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
@@ -546,4 +754,4 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String = instance.toString()
|
override fun toString(): String = instance.toString()
|
||||||
}
|
}
|
||||||
@@ -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.
|
||||||
@@ -28,13 +28,26 @@ import net.sergeych.lynon.LynonType
|
|||||||
class ObjInstanceClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
class ObjInstanceClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
||||||
|
|
||||||
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
val args = decoder.decodeAnyList(scope)
|
val serializedArgs = decoder.decodeAnyList(scope)
|
||||||
val actualSize = constructorMeta?.params?.size ?: 0
|
val meta = constructorMeta ?: scope.raiseError("no constructor meta for $name")
|
||||||
if (args.size > actualSize)
|
val nonTransientCount = meta.params.count { !it.isTransient }
|
||||||
scope.raiseIllegalArgument("constructor $name has only $actualSize but serialized version has ${args.size}")
|
if (serializedArgs.size != nonTransientCount)
|
||||||
val newScope = scope.createChildScope(args = Arguments(args))
|
scope.raiseIllegalArgument("constructor $name expects $nonTransientCount non-transient arguments, but serialized version has ${serializedArgs.size}")
|
||||||
val instance = createInstance(newScope)
|
|
||||||
initializeInstance(instance, newScope.args, runConstructors = false)
|
var sIdx = 0
|
||||||
|
val namedArgs = mutableMapOf<String, Obj>()
|
||||||
|
for (p in meta.params) {
|
||||||
|
if (!p.isTransient) {
|
||||||
|
namedArgs[p.name] = serializedArgs[sIdx++]
|
||||||
|
} else if (p.defaultValue == null) {
|
||||||
|
// If transient parameter has no default value, we use ObjNull to avoid "too few arguments" error
|
||||||
|
namedArgs[p.name] = ObjNull
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Using named arguments allows the constructor to apply default values for transient parameters
|
||||||
|
val newArgs = Arguments(list = emptyList<Obj>(), named = namedArgs)
|
||||||
|
val instance = createInstance(scope.createChildScope(args = newArgs))
|
||||||
|
initializeInstance(instance, newArgs, runConstructors = false)
|
||||||
return instance.apply {
|
return instance.apply {
|
||||||
deserializeStateVars(scope, decoder)
|
deserializeStateVars(scope, decoder)
|
||||||
invokeInstanceMethod(scope, "onDeserialized") { ObjVoid }
|
invokeInstanceMethod(scope, "onDeserialized") { ObjVoid }
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import kotlinx.datetime.*
|
||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
@@ -28,7 +29,6 @@ import net.sergeych.lynon.LynonEncoder
|
|||||||
import net.sergeych.lynon.LynonSettings
|
import net.sergeych.lynon.LynonSettings
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
import kotlin.time.Clock
|
import kotlin.time.Clock
|
||||||
import kotlin.time.Instant
|
|
||||||
import kotlin.time.isDistantFuture
|
import kotlin.time.isDistantFuture
|
||||||
import kotlin.time.isDistantPast
|
import kotlin.time.isDistantPast
|
||||||
|
|
||||||
@@ -122,6 +122,7 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
val nanos = (a0.value - seconds) * 1e9
|
val nanos = (a0.value - seconds) * 1e9
|
||||||
Instant.fromEpochSeconds(seconds, nanos.toLong())
|
Instant.fromEpochSeconds(seconds, nanos.toLong())
|
||||||
}
|
}
|
||||||
|
is ObjString -> Instant.parse(a0.value)
|
||||||
is ObjInstant -> a0.instant
|
is ObjInstant -> a0.instant
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
@@ -189,6 +190,18 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
moduleName = "lyng.time",
|
moduleName = "lyng.time",
|
||||||
getter = { ObjInt(thisAs<ObjInstant>().instant.nanosecondsOfSecond.toLong()) }
|
getter = { ObjInt(thisAs<ObjInstant>().instant.nanosecondsOfSecond.toLong()) }
|
||||||
)
|
)
|
||||||
|
addFnDoc(
|
||||||
|
name = "truncateToMinute",
|
||||||
|
doc = "Truncate this instant to the nearest minute.",
|
||||||
|
returns = type("lyng.Instant"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
val t = thisAs<ObjInstant>().instant
|
||||||
|
val tz = TimeZone.UTC
|
||||||
|
val dt = t.toLocalDateTime(tz)
|
||||||
|
val truncated = LocalDateTime(dt.year, dt.month, dt.dayOfMonth, dt.hour, dt.minute, 0, 0)
|
||||||
|
ObjInstant(truncated.toInstant(tz), LynonSettings.InstantTruncateMode.Second)
|
||||||
|
}
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "truncateToSecond",
|
name = "truncateToSecond",
|
||||||
doc = "Truncate this instant to the nearest second.",
|
doc = "Truncate this instant to the nearest second.",
|
||||||
@@ -222,6 +235,43 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
LynonSettings.InstantTruncateMode.Microsecond
|
LynonSettings.InstantTruncateMode.Microsecond
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toRFC3339",
|
||||||
|
doc = "Return the RFC3339 string representation of this instant in UTC (e.g., '1970-01-01T00:00:00Z').",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
thisAs<ObjInstant>().instant.toString().toObj()
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toSortableString",
|
||||||
|
doc = "Alias to toRFC3339.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
thisAs<ObjInstant>().instant.toString().toObj()
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toDateTime",
|
||||||
|
doc = "Convert this absolute instant to a localized DateTime object in the specified time zone. " +
|
||||||
|
"Accepts a timezone ID string (e.g., 'UTC', '+02:00') or an integer offset in seconds. " +
|
||||||
|
"If no argument is provided, the system's current default time zone is used.",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("tz", type = type("lyng.Any", true))),
|
||||||
|
returns = type("lyng.DateTime"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
val tz = when (val a = args.list.getOrNull(0)) {
|
||||||
|
null -> TimeZone.currentSystemDefault()
|
||||||
|
is ObjString -> TimeZone.of(a.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a.value.toInt()).asTimeZone()
|
||||||
|
else -> raiseIllegalArgument("invalid timezone: $a")
|
||||||
|
}
|
||||||
|
ObjDateTime(thisAs<ObjInstant>().instant, tz)
|
||||||
|
}
|
||||||
|
|
||||||
// class members
|
// class members
|
||||||
|
|
||||||
addClassConst("distantFuture", distantFuture)
|
addClassConst("distantFuture", distantFuture)
|
||||||
@@ -236,5 +286,3 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -55,7 +55,11 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
|||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
if (other !is Numeric) return -2
|
if (other !is Numeric) return -2
|
||||||
return value.compareTo(other.doubleValue)
|
return if (other is ObjInt) {
|
||||||
|
value.compareTo(other.value)
|
||||||
|
} else {
|
||||||
|
doubleValue.compareTo(other.doubleValue)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String = value.toString()
|
override fun toString(): String = value.toString()
|
||||||
@@ -159,13 +163,19 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val cache = Array(256) { ObjInt((it - 128).toLong(), true) }
|
internal const val CACHE_LOW: Long = -1024L
|
||||||
|
internal const val CACHE_HIGH: Long = 1023L
|
||||||
|
private val cache = Array((CACHE_HIGH - CACHE_LOW + 1).toInt()) {
|
||||||
|
ObjInt((it + CACHE_LOW).toLong(), true)
|
||||||
|
}
|
||||||
|
|
||||||
fun of(value: Long): ObjInt {
|
fun of(value: Long): ObjInt {
|
||||||
return if (value in -128L..127L) cache[(value + 128).toInt()]
|
return if (value in CACHE_LOW..CACHE_HIGH) cache[(value - CACHE_LOW).toInt()]
|
||||||
else ObjInt(value)
|
else ObjInt(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal fun cacheArray(): Array<ObjInt> = cache
|
||||||
|
|
||||||
val Zero = of(0)
|
val Zero = of(0)
|
||||||
val One = of(1)
|
val One = of(1)
|
||||||
val type = object : ObjClass("Int") {
|
val type = object : ObjClass("Int") {
|
||||||
@@ -192,4 +202,4 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun Int.toObj() = ObjInt.of(this.toLong())
|
fun Int.toObj() = ObjInt.of(this.toLong())
|
||||||
fun Long.toObj() = ObjInt.of(this)
|
fun Long.toObj() = ObjInt.of(this)
|
||||||
@@ -29,21 +29,26 @@ import net.sergeych.lyng.miniast.type
|
|||||||
*/
|
*/
|
||||||
val ObjIterable by lazy {
|
val ObjIterable by lazy {
|
||||||
ObjClass("Iterable").apply {
|
ObjClass("Iterable").apply {
|
||||||
|
addFn(
|
||||||
|
name = "iterator",
|
||||||
|
isAbstract = true,
|
||||||
|
isClosed = false,
|
||||||
|
code = null
|
||||||
|
)
|
||||||
|
|
||||||
addPropertyDoc(
|
addFnDoc(
|
||||||
name = "toList",
|
name = "toList",
|
||||||
doc = "Collect elements of this iterable into a new list.",
|
doc = "Collect elements of this iterable into a new list.",
|
||||||
type = type("lyng.List"),
|
returns = type("lyng.List"),
|
||||||
moduleName = "lyng.stdlib",
|
moduleName = "lyng.stdlib"
|
||||||
getter = {
|
) {
|
||||||
val result = mutableListOf<Obj>()
|
val result = mutableListOf<Obj>()
|
||||||
val it = this.thisObj.invokeInstanceMethod(this, "iterator")
|
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
||||||
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
while (it.invokeInstanceMethod(this, "hasNext").toBool()) {
|
||||||
result.add(it.invokeInstanceMethod(this, "next"))
|
result.add(it.invokeInstanceMethod(this, "next"))
|
||||||
}
|
|
||||||
ObjList(result)
|
|
||||||
}
|
}
|
||||||
)
|
ObjList(result)
|
||||||
|
}
|
||||||
|
|
||||||
// it is not effective, but it is open:
|
// it is not effective, but it is open:
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
@@ -241,4 +246,4 @@ val ObjIterable by lazy {
|
|||||||
list
|
list
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
Loaded 100 of 224 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user