Compare commits
1
Commits
473a5dd6ed
..
1.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f357f4039b |
No files matched your search
@@ -6,17 +6,3 @@
|
|||||||
- If you need a wrapper for delegated properties, check for `getValue` explicitly and return a concrete `Statement` object when missing; avoid `onNotFoundResult` lambdas.
|
- 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.
|
- 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.
|
- 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.
|
|
||||||
+2
-12
@@ -19,7 +19,6 @@ High-density specification for LLMs. Reference this for all Lyng code generation
|
|||||||
- **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.
|
||||||
@@ -38,15 +37,6 @@ High-density specification for LLMs. Reference this for all Lyng code generation
|
|||||||
- **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`.
|
||||||
@@ -73,11 +63,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 Literals**: `{ key: value, identifier: }` (identifier shorthand `x:` is `x: x`). Empty map is `Map()`.
|
||||||
- **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` via explicit dynamic handler (not implicit fallback).
|
- **Dynamic**: `val d = dynamic { get { name -> ... } }` allows `d.anyName`.
|
||||||
|
|
||||||
## 6. Operators & Methods to Overload
|
## 6. Operators & Methods to Overload
|
||||||
| Op | Method | Op | Method |
|
| Op | Method | Op | Method |
|
||||||
|
|||||||
@@ -25,16 +25,6 @@ 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)
|
||||||
@@ -48,7 +38,6 @@ assertEquals(A.One, A.E.One)
|
|||||||
|
|
||||||
- [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)
|
||||||
|
|||||||
@@ -1,51 +0,0 @@
|
|||||||
# 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.
|
|
||||||
|
|
||||||
## 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.
|
|
||||||
@@ -1,280 +0,0 @@
|
|||||||
# 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.
|
|
||||||
-42
@@ -113,48 +113,6 @@ 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.
|
||||||
|
|||||||
+4
-26
@@ -45,11 +45,10 @@ 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
|
||||||
|
|
||||||
## Ranges are iterable
|
## Finite Ranges are iterable
|
||||||
|
|
||||||
Finite ranges are [Iterable] and can be used in loops and list conversions.
|
So given a range with both ends, you can assume it is [Iterable]. This automatically let
|
||||||
Open-ended ranges are iterable only with an explicit `step`, and open-start
|
use finite ranges in loops and convert it to lists:
|
||||||
ranges are never iterable.
|
|
||||||
|
|
||||||
assert( [-2, -1, 0, 1] == (-2..1).toList() )
|
assert( [-2, -1, 0, 1] == (-2..1).toList() )
|
||||||
>>> void
|
>>> void
|
||||||
@@ -71,26 +70,6 @@ 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:
|
||||||
@@ -119,7 +98,6 @@ 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 |
|
||||||
| step | explicit iteration step | Any? |
|
|
||||||
| start | | Any? |
|
| start | | Any? |
|
||||||
| end | | Any? |
|
| end | | Any? |
|
||||||
| size | for finite ranges, see above | Long |
|
| size | for finite ranges, see above | Long |
|
||||||
@@ -127,4 +105,4 @@ Exclusive end char ranges are supported too:
|
|||||||
|
|
||||||
Ranges are also used with the `clamp(value, range)` function and the `value.clamp(range)` extension method to limit values within boundaries.
|
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
|
[Iterable]: Iterable.md
|
||||||
@@ -1,128 +0,0 @@
|
|||||||
# 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.
|
|
||||||
@@ -4,21 +4,15 @@
|
|||||||
test the Lyng way. It is not meant to be effective.
|
test the Lyng way. It is not meant to be effective.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
fun naiveCountHappyNumbers(): Int {
|
fun naiveCountHappyNumbers() {
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -34,3 +28,4 @@ for( r in 1..900 ) {
|
|||||||
assert( found == 55252 )
|
assert( found == 55252 )
|
||||||
delay(0.05)
|
delay(0.05)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,7 +1,5 @@
|
|||||||
# 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
|
||||||
|
|||||||
+4
-165
@@ -10,7 +10,6 @@ __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
|
||||||
@@ -107,23 +106,6 @@ 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.
|
||||||
@@ -242,9 +224,6 @@ 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:
|
||||||
@@ -263,9 +242,6 @@ 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"
|
||||||
@@ -449,6 +425,8 @@ 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
|
||||||
@@ -456,144 +434,6 @@ 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) {
|
||||||
@@ -1490,7 +1330,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
|
||||||
|
|
||||||
# Built-in types
|
# Integral data types
|
||||||
|
|
||||||
| type | description | literal samples |
|
| type | description | literal samples |
|
||||||
|--------|---------------------------------|---------------------|
|
|--------|---------------------------------|---------------------|
|
||||||
@@ -1500,7 +1340,6 @@ 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 | |
|
||||||
@@ -1892,4 +1731,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).
|
||||||
@@ -1,7 +1,6 @@
|
|||||||
# 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
|
||||||
|
|
||||||
@@ -109,24 +108,6 @@ 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.
|
||||||
|
|
||||||
|
|||||||
@@ -1,133 +0,0 @@
|
|||||||
# 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 2026 Sergey S. Chernov real.sergeych@gmail.com
|
# Copyright 2025 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=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
org.gradle.jvmargs=-Xmx2048M -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
|
||||||
|
|||||||
+250
-40
@@ -25,13 +25,15 @@ 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.tools.LyngDiagnosticSeverity
|
import net.sergeych.lyng.miniast.*
|
||||||
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
|
||||||
@@ -41,8 +43,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 Diag(val start: Int, val end: Int, val message: String, val severity: HighlightSeverity)
|
data class Error(val start: Int, val end: Int, val message: String)
|
||||||
data class Result(val modStamp: Long, val spans: List<Span>, val diagnostics: List<Diag> = emptyList())
|
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null)
|
||||||
|
|
||||||
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
|
||||||
@@ -57,46 +59,224 @@ 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 analysis = LyngAstManager.getAnalysis(collectedInfo.file)
|
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
||||||
|
|
||||||
|
// 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()
|
ProgressManager.checkCanceled()
|
||||||
|
val source = Source(collectedInfo.file.name, text)
|
||||||
|
|
||||||
val out = ArrayList<Span>(256)
|
val out = ArrayList<Span>(256)
|
||||||
val diags = ArrayList<Diag>()
|
|
||||||
|
fun isFollowedByParenOrBlock(rangeEnd: Int): Boolean {
|
||||||
|
var i = rangeEnd
|
||||||
|
while (i < text.length) {
|
||||||
|
val ch = text[i]
|
||||||
|
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) {
|
||||||
fun keyForKind(kind: LyngSemanticKind): com.intellij.openapi.editor.colors.TextAttributesKey? = when (kind) {
|
val s = source.offsetOf(startPos)
|
||||||
LyngSemanticKind.Function -> LyngHighlighterColors.FUNCTION
|
putRange(s, (s + name.length).coerceAtMost(text.length), key)
|
||||||
LyngSemanticKind.Class, LyngSemanticKind.Enum, LyngSemanticKind.TypeAlias -> LyngHighlighterColors.TYPE
|
}
|
||||||
LyngSemanticKind.Value -> LyngHighlighterColors.VALUE
|
fun putMiniRange(r: MiniRange, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
||||||
LyngSemanticKind.Variable -> LyngHighlighterColors.VARIABLE
|
val s = source.offsetOf(r.start)
|
||||||
LyngSemanticKind.Parameter -> LyngHighlighterColors.PARAMETER
|
val e = source.offsetOf(r.end)
|
||||||
LyngSemanticKind.TypeRef -> LyngHighlighterColors.TYPE
|
putRange(s, e, key)
|
||||||
LyngSemanticKind.EnumConstant -> LyngHighlighterColors.ENUM_CONSTANT
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Semantic highlights from shared tooling
|
// Declarations
|
||||||
LyngLanguageTools.semanticHighlights(analysis).forEach { span ->
|
mini.declarations.forEach { d ->
|
||||||
keyForKind(span.kind)?.let { putRange(span.range.start, span.range.endExclusive, it) }
|
if (d.nameStart.source != source) return@forEach
|
||||||
|
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 ->
|
||||||
imp.segments.forEach { seg ->
|
if (imp.range.start.source != source) return@forEach
|
||||||
val start = analysis.source.offsetOf(seg.range.start)
|
imp.segments.forEach { seg -> putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE) }
|
||||||
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 {
|
||||||
analysis.lexicalHighlights.forEach { s ->
|
tokens.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
|
||||||
@@ -122,7 +302,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")) {
|
if (prevWord in setOf("return", "break", "continue") || isFollowedByParenOrBlock(end)) {
|
||||||
putRange(start, end, LyngHighlighterColors.LABEL)
|
putRange(start, end, LyngHighlighterColors.LABEL)
|
||||||
} else {
|
} else {
|
||||||
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
||||||
@@ -135,13 +315,17 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
analysis.diagnostics.forEach { d ->
|
tokens.forEach { s ->
|
||||||
val range = d.range ?: return@forEach
|
if (s.kind == HighlightKind.EnumConstant) {
|
||||||
val severity = if (d.severity == LyngDiagnosticSeverity.Warning) HighlightSeverity.WARNING else HighlightSeverity.ERROR
|
val start = s.range.start
|
||||||
diags += Diag(range.start, range.endExclusive, d.message, severity)
|
val end = s.range.endExclusive
|
||||||
|
if (start in 0..end && end <= text.length && start < end) {
|
||||||
|
putRange(start, end, LyngHighlighterColors.ENUM_CONSTANT)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
return Result(collectedInfo.modStamp, out, diags)
|
return Result(collectedInfo.modStamp, out, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -162,12 +346,13 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
.create()
|
.create()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show errors and warnings
|
// Show syntax error if present
|
||||||
result.diagnostics.forEach { d ->
|
val err = result.error
|
||||||
val start = d.start.coerceIn(0, (doc?.textLength ?: 0))
|
if (err != null) {
|
||||||
val end = d.end.coerceIn(start, (doc?.textLength ?: start))
|
val start = err.start.coerceIn(0, (doc?.textLength ?: 0))
|
||||||
|
val end = err.end.coerceIn(start, (doc?.textLength ?: start))
|
||||||
if (end > start) {
|
if (end > start) {
|
||||||
holder.newAnnotation(d.severity, d.message)
|
holder.newAnnotation(HighlightSeverity.ERROR, err.message)
|
||||||
.range(TextRange(start, end))
|
.range(TextRange(start, end))
|
||||||
.create()
|
.create()
|
||||||
}
|
}
|
||||||
@@ -188,5 +373,30 @@ 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
|
||||||
|
}
|
||||||
}
|
}
|
||||||
+3
-6
@@ -96,10 +96,9 @@ 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 analysis (cached) for both global and member contexts to enable local class/val inference
|
// Build MiniAst (cached) for both global and member contexts to enable local class/val inference
|
||||||
val analysis = LyngAstManager.getAnalysis(file)
|
val mini = LyngAstManager.getMiniAst(file)
|
||||||
val mini = analysis?.mini
|
val binding = LyngAstManager.getBinding(file)
|
||||||
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 {
|
||||||
@@ -161,8 +160,6 @@ 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,8 +29,6 @@ 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
|
||||||
@@ -68,15 +66,9 @@ 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 analysis = LyngAstManager.getAnalysis(file) ?: return null
|
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
||||||
val mini = analysis.mini ?: return null
|
|
||||||
val miniSource = mini.range.start.source
|
val miniSource = mini.range.start.source
|
||||||
val imported = analysis.importedModules.ifEmpty { DocLookupUtils.canonicalImportedModules(mini, text) }
|
val imported = 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
|
||||||
@@ -99,7 +91,6 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -206,7 +197,6 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -322,13 +312,11 @@ 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}")
|
||||||
@@ -366,7 +354,6 @@ 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") {
|
||||||
@@ -385,13 +372,11 @@ 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 {
|
||||||
@@ -410,13 +395,11 @@ 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 {
|
||||||
@@ -429,13 +412,11 @@ 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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -450,7 +431,6 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -532,7 +512,6 @@ 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)
|
||||||
@@ -545,24 +524,6 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
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()
|
||||||
@@ -604,25 +565,6 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
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"
|
||||||
|
|||||||
@@ -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", "step", "property", "constructor"
|
"get", "set", "object", "enum", "init", "by", "property", "constructor"
|
||||||
)
|
)
|
||||||
|
|
||||||
override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
|
override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
|
||||||
|
|||||||
@@ -36,10 +36,9 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
val name = element.text ?: ""
|
val name = element.text ?: ""
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
|
|
||||||
val analysis = LyngAstManager.getAnalysis(file) ?: return emptyArray()
|
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
||||||
val mini = analysis.mini ?: return emptyArray()
|
val binding = LyngAstManager.getBinding(file)
|
||||||
val binding = analysis.binding
|
val imported = DocLookupUtils.canonicalImportedModules(mini, text).toSet()
|
||||||
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
|
||||||
|
|
||||||
@@ -65,13 +64,11 @@ 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)))
|
||||||
}
|
}
|
||||||
@@ -202,7 +199,6 @@ 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)
|
||||||
}
|
}
|
||||||
@@ -218,7 +214,6 @@ 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,21 +22,55 @@ 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.DocLookupUtils
|
import net.sergeych.lyng.miniast.MiniAstBuilder
|
||||||
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 {
|
||||||
getAnalysis(file)?.mini
|
val vFile = file.virtualFile ?: return@runReadAction null
|
||||||
|
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 {
|
||||||
@@ -68,53 +102,32 @@ 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
|
||||||
val combinedStamp = getCombinedStamp(file)
|
var combinedStamp = file.viewProvider.modificationStamp
|
||||||
|
|
||||||
|
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(ANALYSIS_KEY)
|
val cached = file.getUserData(BINDING_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 built = try {
|
val binding = try {
|
||||||
val provider = IdeLenientImportProvider.create()
|
Binder.bind(text, mini)
|
||||||
runBlocking {
|
|
||||||
LyngLanguageTools.analyze(
|
|
||||||
LyngAnalysisRequest(text = text, fileName = file.name, importProvider = provider)
|
|
||||||
)
|
|
||||||
}
|
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
if (built != null) {
|
if (binding != null) {
|
||||||
val merged = built.mini
|
file.putUserData(BINDING_KEY, binding)
|
||||||
if (merged != null && !file.name.endsWith(".lyng.d")) {
|
// stamp is already set by getMiniAst or we set it here if getMiniAst was cached
|
||||||
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
|
|
||||||
}
|
}
|
||||||
null
|
binding
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2025 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() )
|
println( Path(".").list().toList() )
|
||||||
""".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.3.0-SNAPSHOT"
|
version = "1.2.1"
|
||||||
|
|
||||||
// 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
|
||||||
|
|
||||||
|
|||||||
@@ -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,7 +20,6 @@ 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
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -62,59 +61,30 @@ 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 = if (i < arguments.list.size) arguments.list[i] else ObjNull
|
val value = arguments.list[i]
|
||||||
val recordType = if (declaringClass != null && a.accessType != null) {
|
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
||||||
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 = recordType,
|
recordType = ObjRecord.Type.Argument,
|
||||||
declaringClass = declaringClass,
|
declaringClass = declaringClass,
|
||||||
isTransient = a.isTransient
|
isTransient = a.isTransient)
|
||||||
)
|
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun assign(a: Item, value: Obj) {
|
fun assign(a: Item, value: Obj) {
|
||||||
val recordType = if (declaringClass != null && a.accessType != null) {
|
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
||||||
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 = recordType,
|
recordType = ObjRecord.Type.Argument,
|
||||||
declaringClass = declaringClass,
|
declaringClass = declaringClass,
|
||||||
isTransient = a.isTransient
|
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
|
||||||
@@ -195,7 +165,8 @@ 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 missingValue(a, "too few arguments for the call (missing ${a.name})")
|
else a.defaultValue?.execute(scope)
|
||||||
|
?: scope.raiseIllegalArgument("too few arguments for the call (missing ${a.name})")
|
||||||
assign(a, value)
|
assign(a, value)
|
||||||
}
|
}
|
||||||
i++
|
i++
|
||||||
@@ -215,7 +186,8 @@ 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 missingValue(a, "too few arguments for the call")
|
else a.defaultValue?.execute(scope)
|
||||||
|
?: scope.raiseIllegalArgument("too few arguments for the call")
|
||||||
assign(a, value)
|
assign(a, value)
|
||||||
}
|
}
|
||||||
i--
|
i--
|
||||||
@@ -271,4 +243,4 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
val visibility: Visibility? = null,
|
val visibility: Visibility? = null,
|
||||||
val isTransient: Boolean = false,
|
val isTransient: Boolean = false,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 applyScope = scope as? ApplyScope
|
|
||||||
for (capture in captureSlots) {
|
|
||||||
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()
|
|
||||||
|
|
||||||
}
|
|
||||||
@@ -1,23 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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?
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
)
|
|
||||||
@@ -1,22 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,
|
|
||||||
)
|
|
||||||
@@ -1,36 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
class ClassDeclStatement(
|
|
||||||
private val delegate: Statement,
|
|
||||||
private val startPos: Pos,
|
|
||||||
val declaredName: String?,
|
|
||||||
) : Statement() {
|
|
||||||
override val pos: Pos = startPos
|
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
return delegate.execute(scope)
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun callOn(scope: Scope): Obj {
|
|
||||||
val target = scope.parent ?: scope
|
|
||||||
return delegate.execute(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -26,25 +26,12 @@ 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(
|
class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
||||||
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
|
||||||
@@ -84,15 +71,14 @@ class ClosureScope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
class ApplyScope(val callScope: Scope, val applied: Scope) :
|
class ApplyScope(_parent: Scope,val applied: Scope) : Scope(_parent, thisObj = applied.thisObj) {
|
||||||
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, preferredThisType: String?): Scope {
|
override fun applyClosure(closure: Scope): Scope {
|
||||||
return ClosureScope(this, closure, preferredThisType)
|
return this
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -19,24 +19,8 @@ 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(
|
class Function(val name: String): CodeContext()
|
||||||
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
@@ -1,55 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,49 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
class EnumDeclStatement(
|
|
||||||
private val delegate: Statement,
|
|
||||||
private val startPos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override val pos: Pos = startPos
|
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
return delegate.execute(scope)
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun callOn(scope: Scope): Obj {
|
|
||||||
val target = scope.parent ?: scope
|
|
||||||
return delegate.execute(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,34 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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('.', '_')
|
|
||||||
}
|
|
||||||
@@ -1,60 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,57 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,35 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
class FunctionDeclStatement(
|
|
||||||
private val delegate: Statement,
|
|
||||||
private val startPos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override val pos: Pos = startPos
|
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
return delegate.execute(scope)
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun callOn(scope: Scope): Obj {
|
|
||||||
val target = scope.parent ?: scope
|
|
||||||
return delegate.execute(target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,28 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,
|
|
||||||
)
|
|
||||||
@@ -1,37 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,8 +33,6 @@ 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.
|
||||||
@@ -61,7 +59,6 @@ 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)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -94,3 +91,5 @@ class ModuleScope(
|
|||||||
super.get(name)
|
super.get(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -358,7 +358,6 @@ 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
|
||||||
@@ -598,4 +597,4 @@ private class Parser(fromPos: Pos) {
|
|||||||
loadToEndOfLine()
|
loadToEndOfLine()
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -72,5 +72,4 @@ 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,8 +17,6 @@
|
|||||||
|
|
||||||
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
|
||||||
@@ -52,8 +50,6 @@ 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.
|
||||||
@@ -68,21 +64,6 @@ 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
|
||||||
}
|
}
|
||||||
@@ -143,14 +124,6 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
s.getSlotIndexOf(name)?.let { idx ->
|
s.getSlotIndexOf(name)?.let { idx ->
|
||||||
val rec = s.getSlotRecord(idx)
|
val rec = s.getSlotRecord(idx)
|
||||||
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
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
@@ -168,10 +141,6 @@ open class Scope(
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
internal fun resolveCaptureRecord(name: String): ObjRecord? {
|
|
||||||
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:
|
||||||
@@ -357,25 +326,19 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
|
|
||||||
inline fun <reified T : Obj> thisAs(): T {
|
inline fun <reified T : Obj> thisAs(): T {
|
||||||
for (obj in thisVariants) {
|
var s: Scope? = this
|
||||||
if (obj is T) return obj
|
while (s != null) {
|
||||||
|
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 }
|
||||||
@@ -414,20 +377,10 @@ 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) {
|
||||||
val record = slots[index]
|
slots[index].value = newValue
|
||||||
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)
|
||||||
@@ -437,12 +390,6 @@ 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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -463,66 +410,6 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear all references and maps to prevent memory leaks when pooled.
|
* Clear all references and maps to prevent memory leaks when pooled.
|
||||||
*/
|
*/
|
||||||
@@ -530,7 +417,6 @@ 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()
|
||||||
@@ -561,7 +447,7 @@ open class Scope(
|
|||||||
this.parent = parent
|
this.parent = parent
|
||||||
this.args = args
|
this.args = args
|
||||||
this.pos = pos
|
this.pos = pos
|
||||||
setThisVariants(thisObj, parent?.thisVariants ?: emptyList())
|
this.thisObj = thisObj
|
||||||
// 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)
|
||||||
}
|
}
|
||||||
@@ -650,10 +536,7 @@ open class Scope(
|
|||||||
isAbstract: Boolean = false,
|
isAbstract: Boolean = false,
|
||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
isTransient: 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,
|
||||||
@@ -662,19 +545,15 @@ open class Scope(
|
|||||||
isAbstract = isAbstract,
|
isAbstract = isAbstract,
|
||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride,
|
isOverride = isOverride,
|
||||||
isTransient = isTransient,
|
isTransient = isTransient
|
||||||
callSignature = callSignature,
|
|
||||||
memberName = name,
|
|
||||||
fieldId = fieldId,
|
|
||||||
methodId = methodId
|
|
||||||
)
|
)
|
||||||
objects[name] = rec
|
objects[name] = rec
|
||||||
bumpClassLayoutIfNeeded(name, value, recordType)
|
bumpClassLayoutIfNeeded(name, value, recordType)
|
||||||
if (recordType == ObjRecord.Type.Field || recordType == ObjRecord.Type.ConstructorField) {
|
if (recordType == ObjRecord.Type.Field || recordType == ObjRecord.Type.ConstructorField) {
|
||||||
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
||||||
if (inst != null) {
|
if (inst != null) {
|
||||||
val slotId = rec.fieldId ?: inst.objClass.fieldSlotForKey(name)?.slot
|
val slot = inst.objClass.fieldSlotForKey(name)
|
||||||
if (slotId != null) inst.setFieldSlotRecord(slotId, rec)
|
if (slot != null) inst.setFieldSlotRecord(slot.slot, rec)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if (value is Statement ||
|
if (value is Statement ||
|
||||||
@@ -683,8 +562,8 @@ open class Scope(
|
|||||||
recordType == ObjRecord.Type.Property) {
|
recordType == ObjRecord.Type.Property) {
|
||||||
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
||||||
if (inst != null) {
|
if (inst != null) {
|
||||||
val slotId = rec.methodId ?: inst.objClass.methodSlotForKey(name)?.slot
|
val slot = inst.objClass.methodSlotForKey(name)
|
||||||
if (slotId != null) inst.setMethodSlotRecord(slotId, rec)
|
if (slot != null) inst.setMethodSlotRecord(slot.slot, 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
|
||||||
@@ -736,16 +615,7 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun disassembleSymbol(name: String): String {
|
fun addFn(vararg names: String, fn: suspend Scope.() -> Obj) {
|
||||||
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
|
||||||
|
|
||||||
@@ -756,9 +626,7 @@ open class Scope(
|
|||||||
addItem(
|
addItem(
|
||||||
name,
|
name,
|
||||||
false,
|
false,
|
||||||
newFn,
|
newFn
|
||||||
recordType = ObjRecord.Type.Fun,
|
|
||||||
callSignature = callSignature
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -772,10 +640,9 @@ open class Scope(
|
|||||||
eval(code.toSource())
|
eval(code.toSource())
|
||||||
|
|
||||||
suspend fun eval(source: Source): Obj {
|
suspend fun eval(source: Source): Obj {
|
||||||
return Compiler.compileWithResolution(
|
return Compiler.compile(
|
||||||
source,
|
source,
|
||||||
currentImportProvider,
|
currentImportProvider
|
||||||
seedScope = this
|
|
||||||
).execute(this)
|
).execute(this)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -828,8 +695,7 @@ open class Scope(
|
|||||||
println("--------------------")
|
println("--------------------")
|
||||||
}
|
}
|
||||||
|
|
||||||
open fun applyClosure(closure: Scope, preferredThisType: String? = null): Scope =
|
open fun applyClosure(closure: Scope): Scope = ClosureScope(this, closure)
|
||||||
ClosureScope(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.
|
||||||
@@ -841,43 +707,19 @@ 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('.')
|
||||||
val first = parts[0]
|
var ref: ObjRef = LocalVarRef(parts[0], Pos.builtIn)
|
||||||
val ref: ObjRef = if (first == "this") {
|
|
||||||
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)
|
|
||||||
}
|
|
||||||
var ref0: ObjRef = ref
|
|
||||||
for (i in 1 until parts.size) {
|
for (i in 1 until parts.size) {
|
||||||
ref0 = FieldRef(ref0, parts[i], false)
|
ref = FieldRef(ref, parts[i], false)
|
||||||
}
|
}
|
||||||
return ref0.evalValue(this)
|
return ref.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,8 +20,6 @@ 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.bytecode.CmdFunction
|
|
||||||
import net.sergeych.lyng.bytecode.CmdVm
|
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
import net.sergeych.lyng.pacman.ImportManager
|
import net.sergeych.lyng.pacman.ImportManager
|
||||||
@@ -34,58 +32,10 @@ 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.list)
|
|
||||||
}
|
|
||||||
var lastResult: Obj = ObjVoid
|
var lastResult: Obj = ObjVoid
|
||||||
for (s in statements) {
|
for (s in statements) {
|
||||||
lastResult = s.execute(scope)
|
lastResult = s.execute(scope)
|
||||||
@@ -93,80 +43,6 @@ 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()
|
||||||
)
|
)
|
||||||
@@ -198,16 +74,6 @@ 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
|
||||||
@@ -423,7 +289,7 @@ class Script(
|
|||||||
result
|
result
|
||||||
}
|
}
|
||||||
|
|
||||||
addFn("dynamic", callSignature = CallSignature(tailBlockReceiverType = "DelegateContext")) {
|
addFn("dynamic") {
|
||||||
ObjDynamic.create(this, requireOnlyArg())
|
ObjDynamic.create(this, requireOnlyArg())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -459,30 +325,7 @@ 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) {
|
||||||
@@ -509,7 +352,6 @@ 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)
|
||||||
@@ -518,13 +360,8 @@ 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>()
|
||||||
@@ -538,7 +375,7 @@ class Script(
|
|||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
|
|
||||||
addFn("flow", callSignature = CallSignature(tailBlockReceiverType = "FlowBuilder")) {
|
addFn("flow") {
|
||||||
// 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)
|
||||||
@@ -625,4 +462,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, STEP,
|
IN, NOTIN, IS, NOTIS, BY,
|
||||||
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)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,87 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,23 +22,8 @@ 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 Function(
|
// data class Fn(val argTypes: List<ArgsDeclaration.Item>, val retType: TypeDecl) : TypeDecl()
|
||||||
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)
|
||||||
|
|
||||||
|
|||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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,80 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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, TypeAlias, Function, Value, Variable, Parameter }
|
enum class SymbolKind { Class, Enum, Function, Value, Variable, Parameter }
|
||||||
|
|
||||||
data class Symbol(
|
data class Symbol(
|
||||||
val id: Int,
|
val id: Int,
|
||||||
@@ -126,22 +126,13 @@ object Binder {
|
|||||||
}
|
}
|
||||||
// Members (including fields and methods)
|
// Members (including fields and methods)
|
||||||
for (m in d.members) {
|
for (m in d.members) {
|
||||||
when (m) {
|
if (m is MiniMemberValDecl) {
|
||||||
is MiniMemberValDecl -> {
|
val fs = source.offsetOf(m.nameStart)
|
||||||
val fs = source.offsetOf(m.nameStart)
|
val fe = fs + m.name.length
|
||||||
val fe = fs + m.name.length
|
val kind = if (m.mutable) SymbolKind.Variable else SymbolKind.Value
|
||||||
val kind = if (m.mutable) SymbolKind.Variable else SymbolKind.Value
|
val fieldSym = Symbol(nextId++, m.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(m.type))
|
||||||
val fieldSym = Symbol(nextId++, m.name, kind, fs, fe, containerId = sym.id, type = DocLookupUtils.typeOf(m.type))
|
symbols += fieldSym
|
||||||
symbols += fieldSym
|
classScope.fields += fieldSym.id
|
||||||
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 -> {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -206,12 +197,6 @@ 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)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,28 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
@@ -1,70 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
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 Ref(val value: net.sergeych.lyng.obj.ObjRef) : BytecodeConst()
|
|
||||||
data class StatementVal(val statement: net.sergeych.lyng.Statement) : BytecodeConst()
|
|
||||||
data class ListLiteralPlan(val spreads: List<Boolean>) : BytecodeConst()
|
|
||||||
data class ValueFn(val fn: suspend (net.sergeych.lyng.Scope) -> net.sergeych.lyng.obj.ObjRecord) : BytecodeConst()
|
|
||||||
data class SlotPlan(val plan: Map<String, Int>, val captures: List<String> = emptyList()) : 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)
|
|
||||||
}
|
|
||||||
@@ -1,74 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 = objSlots[slot] ?: ObjNull
|
|
||||||
override fun setObj(slot: Int, value: Obj) {
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,272 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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
|
|
||||||
|
|
||||||
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.list)
|
|
||||||
}
|
|
||||||
|
|
||||||
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,
|
|
||||||
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(),
|
|
||||||
): 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,
|
|
||||||
slotTypeByScopeId = slotTypeByScopeId,
|
|
||||||
knownNameObjClass = knownNameObjClass,
|
|
||||||
knownObjectNames = knownObjectNames,
|
|
||||||
classFieldTypesByName = classFieldTypesByName,
|
|
||||||
enumEntriesByName = enumEntriesByName,
|
|
||||||
callableReturnTypeByScopeId = callableReturnTypeByScopeId,
|
|
||||||
callableReturnTypeByName = callableReturnTypeByName
|
|
||||||
)
|
|
||||||
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.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.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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,420 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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)
|
|
||||||
): 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" }
|
|
||||||
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,
|
|
||||||
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.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.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_VALUE_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.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_VALUE_FN -> CmdMakeValueFn(operands[0], operands[1])
|
|
||||||
Opcode.BOX_OBJ -> CmdBoxObj(operands[0], operands[1])
|
|
||||||
Opcode.OBJ_TO_BOOL -> CmdObjToBool(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.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_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()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,315 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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')
|
|
||||||
}
|
|
||||||
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 CmdMakeValueFn -> Opcode.MAKE_VALUE_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 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 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 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.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.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_VALUE_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.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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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 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 <= localCount) { "localSlotNames exceed localCount" }
|
|
||||||
require(addrCount >= 0) { "addrCount must be non-negative" }
|
|
||||||
if (posByIp.isNotEmpty()) {
|
|
||||||
require(posByIp.size == cmds.size) { "posByIp size mismatch" }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,170 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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),
|
|
||||||
MAKE_VALUE_FN(0x0E),
|
|
||||||
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),
|
|
||||||
|
|
||||||
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),
|
|
||||||
ITER_PUSH(0xBF),
|
|
||||||
ITER_POP(0xC0),
|
|
||||||
ITER_CANCEL(0xC1),
|
|
||||||
;
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
private val byCode: Map<Int, Opcode> = values().associateBy { it.code }
|
|
||||||
fun fromCode(code: Int): Opcode? = byCode[code]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,25 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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),
|
|
||||||
}
|
|
||||||
@@ -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", "type", "import", "package",
|
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
||||||
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
||||||
"private", "protected", "static", "open", "extern", "init", "get", "set", "by", "step",
|
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
||||||
// 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.STEP, Type.OBJECT,
|
Type.IN, Type.NOTIN, Type.IS, Type.NOTIS, Type.AS, Type.ASNULL, Type.BY, Type.OBJECT,
|
||||||
Type.AND, Type.OR, Type.NOT -> HighlightKind.Keyword
|
Type.AND, Type.OR, Type.NOT -> HighlightKind.Keyword
|
||||||
|
|
||||||
// labels / annotations
|
// labels / annotations
|
||||||
@@ -242,7 +242,6 @@ 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, TypeAlias, Value, Method, Field }
|
enum class Kind { Function, Class_, Enum, 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,11 +118,9 @@ 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
|
||||||
@@ -137,11 +135,9 @@ 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
|
||||||
}
|
}
|
||||||
@@ -200,9 +196,6 @@ 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 -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -232,7 +225,6 @@ 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))
|
||||||
}
|
}
|
||||||
@@ -297,10 +289,6 @@ 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 -> {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -329,8 +317,6 @@ 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,7 +34,6 @@ 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
|
||||||
@@ -88,7 +87,6 @@ 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
|
||||||
@@ -121,7 +119,6 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -145,7 +142,6 @@ 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
|
||||||
}
|
}
|
||||||
@@ -440,10 +436,7 @@ 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 ||
|
if (sym.kind == net.sergeych.lyng.binding.SymbolKind.Class || sym.kind == net.sergeych.lyng.binding.SymbolKind.Enum) return sym.name
|
||||||
sym.kind == net.sergeych.lyng.binding.SymbolKind.Enum ||
|
|
||||||
sym.kind == net.sergeych.lyng.binding.SymbolKind.TypeAlias
|
|
||||||
) return sym.name
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -458,7 +451,6 @@ 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)
|
||||||
}
|
}
|
||||||
@@ -573,7 +565,6 @@ 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)
|
||||||
@@ -589,10 +580,8 @@ 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)
|
||||||
@@ -932,7 +921,6 @@ 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
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -955,7 +943,6 @@ 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
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1038,8 +1025,6 @@ 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) {
|
||||||
@@ -1050,8 +1035,6 @@ 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,11 +39,10 @@ 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, callSignature = callSignature) { fn() }
|
addFn(*names) { fn() }
|
||||||
// Determine module
|
// Determine module
|
||||||
val mod = moduleName ?: findModuleNameOrUnknown()
|
val mod = moduleName ?: findModuleNameOrUnknown()
|
||||||
// Register docs once per name
|
// Register docs once per name
|
||||||
|
|||||||
@@ -150,18 +150,6 @@ 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
|
||||||
@@ -241,17 +229,6 @@ 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,
|
||||||
@@ -301,17 +278,6 @@ 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,
|
||||||
@@ -341,7 +307,6 @@ 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) {}
|
||||||
@@ -512,41 +477,6 @@ 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)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -65,8 +65,7 @@ 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 } ||
|
||||||
@@ -125,7 +124,17 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Root object fallback
|
// 2. Extensions in scope
|
||||||
|
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 ->
|
||||||
@@ -142,15 +151,6 @@ 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")
|
val m = objClass.getInstanceMemberOrNull("equals") ?: scope.findExtension(objClass, "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")
|
val m = objClass.getInstanceMemberOrNull("plusAssign") ?: scope.findExtension(objClass, "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")
|
val m = objClass.getInstanceMemberOrNull("minusAssign") ?: scope.findExtension(objClass, "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")
|
val m = objClass.getInstanceMemberOrNull("mulAssign") ?: scope.findExtension(objClass, "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")
|
val m = objClass.getInstanceMemberOrNull("divAssign") ?: scope.findExtension(objClass, "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")
|
val m = objClass.getInstanceMemberOrNull("modAssign") ?: scope.findExtension(objClass, "modAssign")
|
||||||
return if (m != null) {
|
return if (m != null) {
|
||||||
invokeInstanceMethod(scope, "modAssign", Arguments(other))
|
invokeInstanceMethod(scope, "modAssign", Arguments(other))
|
||||||
} else null
|
} else null
|
||||||
@@ -467,7 +467,16 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 2. Root fallback
|
// 2. Extensions
|
||||||
|
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 ->
|
||||||
@@ -482,14 +491,6 @@ 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)}"
|
||||||
@@ -500,11 +501,9 @@ 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 getValueRec = del.objClass.getInstanceMemberOrNull("getValue")
|
if (del.objClass.getInstanceMemberOrNull("getValue") == null) {
|
||||||
if (getValueRec == null || getValueRec.declaringClass?.className == "Delegate") {
|
|
||||||
val wrapper = 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()
|
||||||
@@ -559,7 +558,11 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// 2. Root fallback
|
// 2. Extensions
|
||||||
|
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") {
|
||||||
@@ -606,19 +609,16 @@ 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 =
|
||||||
val usePool = PerfFlags.SCOPE_POOL && this !is Statement
|
if (PerfFlags.SCOPE_POOL)
|
||||||
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(
|
||||||
@@ -725,8 +725,7 @@ 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 {
|
||||||
val appliedScope = createChildScope(newThisObj = thisObj)
|
body.callOn(this)
|
||||||
body.callOn(ApplyScope(this, appliedScope))
|
|
||||||
}
|
}
|
||||||
thisObj
|
thisObj
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -118,34 +118,28 @@ open class ObjClass(
|
|||||||
|
|
||||||
/**
|
/**
|
||||||
* 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.
|
||||||
* Cached and invalidated by layoutVersion to reflect newly added members.
|
* This is pre-calculated to avoid MRO traversal and string concatenation during common access.
|
||||||
*/
|
*/
|
||||||
private var publicMemberResolutionVersion: Int = -1
|
val publicMemberResolution: Map<String, String> by lazy {
|
||||||
private var publicMemberResolutionCache: Map<String, String> = emptyMap()
|
val res = mutableMapOf<String, String>()
|
||||||
val publicMemberResolution: Map<String, String>
|
// Traverse MRO in REVERSED order so that child classes override parent classes in the map.
|
||||||
get() {
|
for (cls in mro.reversed()) {
|
||||||
if (publicMemberResolutionVersion == layoutVersion) return publicMemberResolutionCache
|
if (cls.className == "Obj") continue
|
||||||
val res = mutableMapOf<String, String>()
|
for ((name, rec) in cls.members) {
|
||||||
// Traverse MRO in REVERSED order so that child classes override parent classes in the map.
|
if (rec.visibility == Visibility.Public) {
|
||||||
for (cls in mro.reversed()) {
|
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
if (cls.className == "Obj") continue
|
res[name] = key
|
||||||
for ((name, rec) in cls.members) {
|
}
|
||||||
if (rec.visibility == Visibility.Public) {
|
}
|
||||||
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
res[name] = key
|
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
|
||||||
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) }
|
||||||
|
|
||||||
@@ -275,11 +269,6 @@ open class ObjClass(
|
|||||||
internal data class FieldSlot(val slot: Int, val record: ObjRecord)
|
internal data class FieldSlot(val slot: Int, val record: ObjRecord)
|
||||||
internal data class ResolvedMember(val record: ObjRecord, val declaringClass: ObjClass)
|
internal data class ResolvedMember(val record: ObjRecord, val declaringClass: ObjClass)
|
||||||
internal data class MethodSlot(val slot: Int, val record: ObjRecord)
|
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 fieldSlotLayoutVersion: Int = -1
|
||||||
private var fieldSlotMap: Map<String, FieldSlot> = emptyMap()
|
private var fieldSlotMap: Map<String, FieldSlot> = emptyMap()
|
||||||
private var fieldSlotCount: Int = 0
|
private var fieldSlotCount: Int = 0
|
||||||
@@ -292,29 +281,19 @@ open class ObjClass(
|
|||||||
private fun ensureFieldSlots(): Map<String, FieldSlot> {
|
private fun ensureFieldSlots(): Map<String, FieldSlot> {
|
||||||
if (fieldSlotLayoutVersion == layoutVersion) return fieldSlotMap
|
if (fieldSlotLayoutVersion == layoutVersion) return fieldSlotMap
|
||||||
val res = mutableMapOf<String, FieldSlot>()
|
val res = mutableMapOf<String, FieldSlot>()
|
||||||
var maxId = -1
|
var idx = 0
|
||||||
for (cls in mro) {
|
for (cls in mro) {
|
||||||
for ((name, rec) in cls.members) {
|
for ((name, rec) in cls.members) {
|
||||||
if (rec.isAbstract) continue
|
if (rec.isAbstract) continue
|
||||||
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
|
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
|
||||||
val key = cls.mangledName(name)
|
val key = cls.mangledName(name)
|
||||||
if (res.containsKey(key)) continue
|
if (res.containsKey(key)) continue
|
||||||
val fieldId = rec.fieldId ?: cls.assignFieldId(name, rec)
|
res[key] = FieldSlot(idx, rec)
|
||||||
res[key] = FieldSlot(fieldId, rec)
|
idx += 1
|
||||||
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
|
fieldSlotMap = res
|
||||||
fieldSlotCount = maxId + 1
|
fieldSlotCount = idx
|
||||||
fieldSlotLayoutVersion = layoutVersion
|
fieldSlotLayoutVersion = layoutVersion
|
||||||
return fieldSlotMap
|
return fieldSlotMap
|
||||||
}
|
}
|
||||||
@@ -323,6 +302,7 @@ open class ObjClass(
|
|||||||
if (instanceMemberLayoutVersion == layoutVersion) return instanceMemberCache
|
if (instanceMemberLayoutVersion == layoutVersion) return instanceMemberCache
|
||||||
val res = mutableMapOf<String, ResolvedMember>()
|
val res = mutableMapOf<String, ResolvedMember>()
|
||||||
for (cls in mro) {
|
for (cls in mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
for ((name, rec) in cls.members) {
|
for ((name, rec) in cls.members) {
|
||||||
if (rec.isAbstract) continue
|
if (rec.isAbstract) continue
|
||||||
if (res.containsKey(name)) continue
|
if (res.containsKey(name)) continue
|
||||||
@@ -344,7 +324,7 @@ open class ObjClass(
|
|||||||
private fun ensureMethodSlots(): Map<String, MethodSlot> {
|
private fun ensureMethodSlots(): Map<String, MethodSlot> {
|
||||||
if (methodSlotLayoutVersion == layoutVersion) return methodSlotMap
|
if (methodSlotLayoutVersion == layoutVersion) return methodSlotMap
|
||||||
val res = mutableMapOf<String, MethodSlot>()
|
val res = mutableMapOf<String, MethodSlot>()
|
||||||
var maxId = -1
|
var idx = 0
|
||||||
for (cls in mro) {
|
for (cls in mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
for ((name, rec) in cls.members) {
|
for ((name, rec) in cls.members) {
|
||||||
@@ -357,9 +337,8 @@ open class ObjClass(
|
|||||||
}
|
}
|
||||||
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
if (res.containsKey(key)) continue
|
if (res.containsKey(key)) continue
|
||||||
val methodId = rec.methodId ?: cls.assignMethodId(name, rec)
|
res[key] = MethodSlot(idx, rec)
|
||||||
res[key] = MethodSlot(methodId, rec)
|
idx += 1
|
||||||
if (methodId > maxId) maxId = methodId
|
|
||||||
}
|
}
|
||||||
cls.classScope?.objects?.forEach { (name, rec) ->
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
if (rec.isAbstract) return@forEach
|
if (rec.isAbstract) return@forEach
|
||||||
@@ -368,13 +347,12 @@ open class ObjClass(
|
|||||||
rec.type != ObjRecord.Type.Property) return@forEach
|
rec.type != ObjRecord.Type.Property) return@forEach
|
||||||
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
if (res.containsKey(key)) return@forEach
|
if (res.containsKey(key)) return@forEach
|
||||||
val methodId = rec.methodId ?: cls.assignMethodId(name, rec)
|
res[key] = MethodSlot(idx, rec)
|
||||||
res[key] = MethodSlot(methodId, rec)
|
idx += 1
|
||||||
if (methodId > maxId) maxId = methodId
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
methodSlotMap = res
|
methodSlotMap = res
|
||||||
methodSlotCount = maxId + 1
|
methodSlotCount = idx
|
||||||
methodSlotLayoutVersion = layoutVersion
|
methodSlotLayoutVersion = layoutVersion
|
||||||
return methodSlotMap
|
return methodSlotMap
|
||||||
}
|
}
|
||||||
@@ -390,10 +368,6 @@ open class ObjClass(
|
|||||||
}
|
}
|
||||||
|
|
||||||
internal fun fieldSlotMap(): Map<String, FieldSlot> = ensureFieldSlots()
|
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 resolveInstanceMember(name: String): ResolvedMember? = ensureInstanceMemberCache()[name]
|
||||||
internal fun methodSlotCount(): Int {
|
internal fun methodSlotCount(): Int {
|
||||||
ensureMethodSlots()
|
ensureMethodSlots()
|
||||||
@@ -404,117 +378,6 @@ open class ObjClass(
|
|||||||
return methodSlotMap[key]
|
return methodSlotMap[key]
|
||||||
}
|
}
|
||||||
internal fun methodSlotMap(): Map<String, MethodSlot> = ensureMethodSlots()
|
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
|
||||||
|
|
||||||
@@ -749,15 +612,12 @@ open class ObjClass(
|
|||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
isTransient: 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
|
||||||
existing = getInstanceMemberOrNull(name, includeAbstract = true, includeStatic = false)
|
val 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.
|
||||||
@@ -788,56 +648,6 @@ 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,
|
||||||
@@ -845,10 +655,7 @@ open class ObjClass(
|
|||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride,
|
isOverride = isOverride,
|
||||||
isTransient = isTransient,
|
isTransient = isTransient,
|
||||||
type = type,
|
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
|
||||||
@@ -869,52 +676,13 @@ open class ObjClass(
|
|||||||
writeVisibility: Visibility? = null,
|
writeVisibility: Visibility? = null,
|
||||||
pos: Pos = Pos.builtIn,
|
pos: Pos = Pos.builtIn,
|
||||||
isTransient: 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 {
|
||||||
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 effectiveFieldId = if (type == ObjRecord.Type.Field || type == ObjRecord.Type.ConstructorField) {
|
val rec = classScope!!.addItem(name, isMutable, initialValue, visibility, writeVisibility, recordType = type, isTransient = isTransient)
|
||||||
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
|
||||||
@@ -930,15 +698,13 @@ 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
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -955,8 +721,7 @@ 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 } }
|
||||||
@@ -964,8 +729,7 @@ 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
|
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -122,12 +122,8 @@ 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,48 +92,34 @@ 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 nestedCapture = stackTraceCaptureDepth > 0
|
val maybeCls = scope.get("StackTraceEntry")?.value as? ObjClass
|
||||||
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
|
||||||
try {
|
while (s != null) {
|
||||||
while (s != null) {
|
val pos = s.pos
|
||||||
val pos = s.pos
|
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
||||||
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
if( (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) ) {
|
||||||
if (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) {
|
if (maybeCls != null) {
|
||||||
val fallback =
|
result.list += maybeCls.callWithArgs(
|
||||||
ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${pos.currentLine}")
|
scope,
|
||||||
if (maybeCls != null) {
|
pos.source.objSourceName,
|
||||||
try {
|
ObjInt(pos.line.toLong()),
|
||||||
result.list += maybeCls.callWithArgs(
|
ObjInt(pos.column.toLong()),
|
||||||
scope,
|
ObjString(pos.currentLine)
|
||||||
pos.source.objSourceName,
|
)
|
||||||
ObjInt(pos.line.toLong()),
|
} else {
|
||||||
ObjInt(pos.column.toLong()),
|
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
||||||
ObjString(pos.currentLine)
|
result.list += ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${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
|
|
||||||
}
|
}
|
||||||
return result
|
s = s.parent
|
||||||
} 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) {
|
||||||
@@ -358,11 +344,7 @@ 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 ?: when (this) {
|
val s = scope ?: Script.newScope()
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -379,25 +361,16 @@ 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 ?: when (this) {
|
val s = scope ?: Script.newScope()
|
||||||
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"
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -423,16 +396,9 @@ 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 {
|
||||||
val sc = scope ?: when (this) {
|
if (this is ObjException) raise()
|
||||||
is ObjException -> this.scope
|
val sc = scope ?: Script.newScope()
|
||||||
is ObjInstance -> this.instanceScope
|
val msg = getLyngExceptionMessage(sc)
|
||||||
else -> Script.newScope()
|
val pos = (this as? ObjInstance)?.instanceScope?.pos ?: Pos.builtIn
|
||||||
}
|
|
||||||
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)
|
||||||
}
|
}
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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) {
|
||||||
channel.close(x)
|
// Suppress stack traces in background producer to avoid noisy stderr during tests.
|
||||||
return@globalLaunch
|
// If needed, consider routing to a logger in the future.
|
||||||
}
|
}
|
||||||
channel.close()
|
channel.close()
|
||||||
}
|
}
|
||||||
@@ -107,7 +107,9 @@ class ObjFlow(val producer: Statement, val scope: Scope) : Obj() {
|
|||||||
) {
|
) {
|
||||||
val objFlow = thisAs<ObjFlow>()
|
val objFlow = thisAs<ObjFlow>()
|
||||||
ObjFlowIterator(statement {
|
ObjFlowIterator(statement {
|
||||||
objFlow.producer.execute(this)
|
objFlow.producer.execute(
|
||||||
|
ClosureScope(this, objFlow.scope)
|
||||||
|
)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -135,7 +137,6 @@ 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,7 +19,10 @@ 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.*
|
import net.sergeych.lyng.Arguments
|
||||||
|
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
|
||||||
@@ -58,14 +61,6 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
return if (idx >= 0 && idx < methodSlots.size) methodSlots[idx] else null
|
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
|
||||||
|
|
||||||
@@ -170,21 +165,9 @@ 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)))
|
||||||
return obj.copy(value = res, type = ObjRecord.Type.Other)
|
obj.value = res
|
||||||
|
return obj
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map member template to instance storage if applicable
|
// Map member template to instance storage if applicable
|
||||||
@@ -192,12 +175,12 @@ 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)
|
||||||
val scoped = instanceScope.objects[mangled]
|
fieldRecordForKey(mangled)?.let {
|
||||||
if (scoped != null) {
|
targetRec = it
|
||||||
targetRec = scoped
|
}
|
||||||
} else {
|
if (targetRec === obj) {
|
||||||
fieldRecordForKey(mangled)?.let {
|
instanceScope.objects[mangled]?.let {
|
||||||
targetRec = it
|
targetRec = it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -365,16 +348,6 @@ 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 ->
|
methodRecordForKey(key)?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
@@ -609,7 +582,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
// Qualified field access: prefer mangled storage for the qualified ancestor
|
// Qualified field access: prefer mangled storage for the qualified ancestor
|
||||||
val mangled = "${startClass.className}::$name"
|
val mangled = "${startClass.className}::$name"
|
||||||
instance.instanceScope.objects[mangled]?.let { rec ->
|
instance.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
// 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
|
||||||
@@ -617,7 +590,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
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)
|
||||||
}
|
}
|
||||||
instance.fieldRecordForKey(mangled)?.let { rec ->
|
instance.instanceScope.objects[mangled]?.let { rec ->
|
||||||
// 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
|
||||||
@@ -653,7 +626,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
||||||
// Qualified write: target mangled storage for the ancestor
|
// Qualified write: target mangled storage for the ancestor
|
||||||
val mangled = "${startClass.className}::$name"
|
val mangled = "${startClass.className}::$name"
|
||||||
instance.instanceScope.objects[mangled]?.let { f ->
|
instance.fieldRecordForKey(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, name))
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
@@ -665,7 +638,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
if (f.value.assign(scope, newValue) == null) f.value = newValue
|
if (f.value.assign(scope, newValue) == null) f.value = newValue
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
instance.fieldRecordForKey(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, name))
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
@@ -716,15 +689,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
val saved = instance.instanceScope.currentClassCtx
|
val saved = instance.instanceScope.currentClassCtx
|
||||||
instance.instanceScope.currentClassCtx = decl
|
instance.instanceScope.currentClassCtx = decl
|
||||||
try {
|
try {
|
||||||
return when (rec.type) {
|
return rec.value.invoke(instance.instanceScope, instance, args)
|
||||||
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
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -286,3 +286,5 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -29,26 +29,21 @@ 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
|
|
||||||
)
|
|
||||||
|
|
||||||
addFnDoc(
|
addPropertyDoc(
|
||||||
name = "toList",
|
name = "toList",
|
||||||
doc = "Collect elements of this iterable into a new list.",
|
doc = "Collect elements of this iterable into a new list.",
|
||||||
returns = type("lyng.List"),
|
type = type("lyng.List"),
|
||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib",
|
||||||
) {
|
getter = {
|
||||||
val result = mutableListOf<Obj>()
|
val result = mutableListOf<Obj>()
|
||||||
val it = thisObj.invokeInstanceMethod(this, "iterator")
|
val it = this.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(
|
||||||
@@ -246,4 +241,4 @@ val ObjIterable by lazy {
|
|||||||
list
|
list
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.*
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lazy delegate used by `val x by lazy { ... }`.
|
|
||||||
*/
|
|
||||||
class ObjLazyDelegate(
|
|
||||||
private val builder: Statement,
|
|
||||||
private val capturedScope: Scope,
|
|
||||||
) : Obj() {
|
|
||||||
override val objClass: ObjClass = type
|
|
||||||
|
|
||||||
private var calculated = false
|
|
||||||
private var cachedValue: Obj = ObjVoid
|
|
||||||
|
|
||||||
override suspend fun invokeInstanceMethod(
|
|
||||||
scope: Scope,
|
|
||||||
name: String,
|
|
||||||
args: Arguments,
|
|
||||||
onNotFoundResult: (suspend () -> Obj?)?,
|
|
||||||
): Obj {
|
|
||||||
return when (name) {
|
|
||||||
"getValue" -> {
|
|
||||||
if (!calculated) {
|
|
||||||
val callScope = capturedScope.createChildScope(capturedScope.pos, args = Arguments.EMPTY)
|
|
||||||
cachedValue = builder.callOn(callScope)
|
|
||||||
calculated = true
|
|
||||||
}
|
|
||||||
cachedValue
|
|
||||||
}
|
|
||||||
"setValue" -> scope.raiseIllegalAssignment("lazy delegate is read-only")
|
|
||||||
else -> super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
val type = ObjClass("LazyDelegate").apply {
|
|
||||||
implementingNames.add("Delegate")
|
|
||||||
createField(
|
|
||||||
"getValue",
|
|
||||||
ObjNull,
|
|
||||||
isMutable = false,
|
|
||||||
visibility = Visibility.Public,
|
|
||||||
pos = Pos.builtIn,
|
|
||||||
declaringClass = this,
|
|
||||||
type = ObjRecord.Type.Fun
|
|
||||||
)
|
|
||||||
createField(
|
|
||||||
"setValue",
|
|
||||||
ObjNull,
|
|
||||||
isMutable = false,
|
|
||||||
visibility = Visibility.Public,
|
|
||||||
pos = Pos.builtIn,
|
|
||||||
declaringClass = this,
|
|
||||||
type = ObjRecord.Type.Fun
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -247,10 +247,6 @@ class ObjList(val list: MutableList<Obj> = mutableListOf()) : Obj() {
|
|||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = object : ObjClass("List", ObjArray) {
|
val type = object : ObjClass("List", ObjArray) {
|
||||||
override suspend fun callOn(scope: Scope): Obj {
|
|
||||||
return ObjList(scope.args.list.toMutableList())
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
return ObjList(decoder.decodeAnyList(scope))
|
return ObjList(decoder.decodeAnyList(scope))
|
||||||
}
|
}
|
||||||
@@ -523,3 +519,4 @@ fun <T>MutableList<T>.swap(i: Int, j: Int) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -23,16 +23,10 @@ import net.sergeych.lyng.miniast.addFnDoc
|
|||||||
import net.sergeych.lyng.miniast.addPropertyDoc
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
import net.sergeych.lyng.miniast.type
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
class ObjRange(
|
class ObjRange(val start: Obj?, val end: Obj?, val isEndInclusive: Boolean) : Obj() {
|
||||||
val start: Obj?,
|
|
||||||
val end: Obj?,
|
|
||||||
val isEndInclusive: Boolean,
|
|
||||||
val step: Obj? = null
|
|
||||||
) : Obj() {
|
|
||||||
|
|
||||||
val isOpenStart by lazy { start == null || start.isNull }
|
val isOpenStart by lazy { start == null || start.isNull }
|
||||||
val isOpenEnd by lazy { end == null || end.isNull }
|
val isOpenEnd by lazy { end == null || end.isNull }
|
||||||
val hasExplicitStep: Boolean get() = step != null && !step.isNull
|
|
||||||
|
|
||||||
override val objClass: ObjClass get() = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
@@ -41,9 +35,6 @@ class ObjRange(
|
|||||||
result.append("${start?.inspect(scope) ?: '∞'} ..")
|
result.append("${start?.inspect(scope) ?: '∞'} ..")
|
||||||
if (!isEndInclusive) result.append('<')
|
if (!isEndInclusive) result.append('<')
|
||||||
result.append(" ${end?.inspect(scope) ?: '∞'}")
|
result.append(" ${end?.inspect(scope) ?: '∞'}")
|
||||||
if (hasExplicitStep) {
|
|
||||||
result.append(" step ${step?.inspect(scope)}")
|
|
||||||
}
|
|
||||||
return ObjString(result.toString())
|
return ObjString(result.toString())
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -73,26 +64,26 @@ class ObjRange(
|
|||||||
}
|
}
|
||||||
|
|
||||||
suspend fun containsRange(scope: Scope, other: ObjRange): Boolean {
|
suspend fun containsRange(scope: Scope, other: ObjRange): Boolean {
|
||||||
if (!isOpenStart) {
|
if (start != null) {
|
||||||
// our start is not -∞ so other start should be GTE or is not contained:
|
// our start is not -∞ so other start should be GTE or is not contained:
|
||||||
if (!other.isOpenStart && start!!.compareTo(scope, other.start!!) > 0) return false
|
if (other.start != null && start.compareTo(scope, other.start) > 0) return false
|
||||||
}
|
}
|
||||||
if (!isOpenEnd) {
|
if (end != null) {
|
||||||
// same with the end: if it is open, it can't be contained in ours:
|
// same with the end: if it is open, it can't be contained in ours:
|
||||||
if (other.isOpenEnd) return false
|
if (other.end == null) return false
|
||||||
// both exists, now there could be 4 cases:
|
// both exists, now there could be 4 cases:
|
||||||
return when {
|
return when {
|
||||||
other.isEndInclusive && isEndInclusive ->
|
other.isEndInclusive && isEndInclusive ->
|
||||||
end!!.compareTo(scope, other.end!!) >= 0
|
end.compareTo(scope, other.end) >= 0
|
||||||
|
|
||||||
!other.isEndInclusive && !isEndInclusive ->
|
!other.isEndInclusive && !isEndInclusive ->
|
||||||
end!!.compareTo(scope, other.end!!) >= 0
|
end.compareTo(scope, other.end) >= 0
|
||||||
|
|
||||||
other.isEndInclusive && !isEndInclusive ->
|
other.isEndInclusive && !isEndInclusive ->
|
||||||
end!!.compareTo(scope, other.end!!) > 0
|
end.compareTo(scope, other.end) > 0
|
||||||
|
|
||||||
!other.isEndInclusive && isEndInclusive ->
|
!other.isEndInclusive && isEndInclusive ->
|
||||||
end!!.compareTo(scope, other.end!!) >= 0
|
end.compareTo(scope, other.end) >= 0
|
||||||
|
|
||||||
else -> throw IllegalStateException("unknown comparison")
|
else -> throw IllegalStateException("unknown comparison")
|
||||||
}
|
}
|
||||||
@@ -129,12 +120,12 @@ class ObjRange(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isOpenStart && isOpenEnd) return true
|
if (start == null && end == null) return true
|
||||||
if (!isOpenStart) {
|
if (start != null) {
|
||||||
if (start!!.compareTo(scope, other) > 0) return false
|
if (start.compareTo(scope, other) > 0) return false
|
||||||
}
|
}
|
||||||
if (!isOpenEnd) {
|
if (end != null) {
|
||||||
val cmp = end!!.compareTo(scope, other)
|
val cmp = end.compareTo(scope, other)
|
||||||
if (isEndInclusive && cmp < 0 || !isEndInclusive && cmp <= 0) return false
|
if (isEndInclusive && cmp < 0 || !isEndInclusive && cmp <= 0) return false
|
||||||
}
|
}
|
||||||
return true
|
return true
|
||||||
@@ -149,7 +140,7 @@ class ObjRange(
|
|||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun enumerate(scope: Scope, callback: suspend (Obj) -> Boolean) {
|
override suspend fun enumerate(scope: Scope, callback: suspend (Obj) -> Boolean) {
|
||||||
if (!hasExplicitStep && start is ObjInt && end is ObjInt) {
|
if (start is ObjInt && end is ObjInt) {
|
||||||
val s = start.value
|
val s = start.value
|
||||||
val e = end.value
|
val e = end.value
|
||||||
if (isEndInclusive) {
|
if (isEndInclusive) {
|
||||||
@@ -161,7 +152,7 @@ class ObjRange(
|
|||||||
if (!callback(ObjInt.of(i))) break
|
if (!callback(ObjInt.of(i))) break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else if (!hasExplicitStep && start is ObjChar && end is ObjChar) {
|
} else if (start is ObjChar && end is ObjChar) {
|
||||||
val s = start.value
|
val s = start.value
|
||||||
val e = end.value
|
val e = end.value
|
||||||
if (isEndInclusive) {
|
if (isEndInclusive) {
|
||||||
@@ -180,11 +171,7 @@ class ObjRange(
|
|||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
return (other as? ObjRange)?.let {
|
return (other as? ObjRange)?.let {
|
||||||
if (start == other.start &&
|
if( start == other.start && end == other.end ) 0 else -1
|
||||||
end == other.end &&
|
|
||||||
isEndInclusive == other.isEndInclusive &&
|
|
||||||
step == other.step
|
|
||||||
) 0 else -1
|
|
||||||
}
|
}
|
||||||
?: -1
|
?: -1
|
||||||
}
|
}
|
||||||
@@ -193,7 +180,6 @@ class ObjRange(
|
|||||||
var result = start?.hashCode() ?: 0
|
var result = start?.hashCode() ?: 0
|
||||||
result = 31 * result + (end?.hashCode() ?: 0)
|
result = 31 * result + (end?.hashCode() ?: 0)
|
||||||
result = 31 * result + isEndInclusive.hashCode()
|
result = 31 * result + isEndInclusive.hashCode()
|
||||||
result = 31 * result + (step?.hashCode() ?: 0)
|
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -206,7 +192,6 @@ class ObjRange(
|
|||||||
if (start != other.start) return false
|
if (start != other.start) return false
|
||||||
if (end != other.end) return false
|
if (end != other.end) return false
|
||||||
if (isEndInclusive != other.isEndInclusive) return false
|
if (isEndInclusive != other.isEndInclusive) return false
|
||||||
if (step != other.step) return false
|
|
||||||
|
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
@@ -228,19 +213,12 @@ class ObjRange(
|
|||||||
moduleName = "lyng.stdlib",
|
moduleName = "lyng.stdlib",
|
||||||
getter = { thisAs<ObjRange>().end ?: ObjNull }
|
getter = { thisAs<ObjRange>().end ?: ObjNull }
|
||||||
)
|
)
|
||||||
addPropertyDoc(
|
|
||||||
name = "step",
|
|
||||||
doc = "Explicit step for iteration, or null if implicit.",
|
|
||||||
type = type("lyng.Any", nullable = true),
|
|
||||||
moduleName = "lyng.stdlib",
|
|
||||||
getter = { thisAs<ObjRange>().step ?: ObjNull }
|
|
||||||
)
|
|
||||||
addPropertyDoc(
|
addPropertyDoc(
|
||||||
name = "isOpen",
|
name = "isOpen",
|
||||||
doc = "Whether the range is open on either side (no start or no end).",
|
doc = "Whether the range is open on either side (no start or no end).",
|
||||||
type = type("lyng.Bool"),
|
type = type("lyng.Bool"),
|
||||||
moduleName = "lyng.stdlib",
|
moduleName = "lyng.stdlib",
|
||||||
getter = { thisAs<ObjRange>().let { it.isOpenStart || it.isOpenEnd }.toObj() }
|
getter = { thisAs<ObjRange>().let { it.start == null || it.end == null }.toObj() }
|
||||||
)
|
)
|
||||||
addPropertyDoc(
|
addPropertyDoc(
|
||||||
name = "isIntRange",
|
name = "isIntRange",
|
||||||
@@ -270,78 +248,20 @@ class ObjRange(
|
|||||||
moduleName = "lyng.stdlib"
|
moduleName = "lyng.stdlib"
|
||||||
) {
|
) {
|
||||||
val self = thisAs<ObjRange>()
|
val self = thisAs<ObjRange>()
|
||||||
self.buildIterator(this)
|
if (net.sergeych.lyng.PerfFlags.RANGE_FAST_ITER) {
|
||||||
}
|
val s = self.start
|
||||||
}
|
val e = self.end
|
||||||
}
|
if (s is ObjInt && e is ObjInt) {
|
||||||
|
val start = s.value.toInt()
|
||||||
private fun explicitStepOrNull(): Obj? = step?.takeUnless { it.isNull }
|
val endExclusive = (if (self.isEndInclusive) e.value.toInt() + 1 else e.value.toInt())
|
||||||
|
// Only for ascending simple ranges; fall back otherwise
|
||||||
private suspend fun resolveStep(scope: Scope, explicitStep: Obj?): Obj {
|
if (start <= endExclusive) {
|
||||||
val startObj = start ?: ObjNull
|
return@addFnDoc ObjFastIntRangeIterator(start, endExclusive)
|
||||||
if (explicitStep != null) {
|
}
|
||||||
if (explicitStep is Numeric && explicitStep.doubleValue == 0.0) {
|
}
|
||||||
scope.raiseIllegalState("Range step cannot be zero")
|
|
||||||
}
|
|
||||||
if (startObj is ObjChar && explicitStep !is ObjInt) {
|
|
||||||
scope.raiseIllegalState("Char range step must be Int")
|
|
||||||
}
|
|
||||||
if (startObj is Numeric && explicitStep !is Numeric) {
|
|
||||||
scope.raiseIllegalState("Numeric range step must be numeric")
|
|
||||||
}
|
|
||||||
return explicitStep
|
|
||||||
}
|
|
||||||
if (startObj is ObjInt) {
|
|
||||||
val cmp = if (end == null || end.isNull) 0 else startObj.compareTo(scope, end)
|
|
||||||
val dir = if (cmp >= 0) -1 else 1
|
|
||||||
return ObjInt.of(dir.toLong())
|
|
||||||
}
|
|
||||||
if (startObj is ObjChar) {
|
|
||||||
val endChar = end as? ObjChar
|
|
||||||
?: scope.raiseIllegalState("Char range requires Char end to infer step")
|
|
||||||
val dir = if (startObj.value >= endChar.value) -1 else 1
|
|
||||||
return ObjInt.of(dir.toLong())
|
|
||||||
}
|
|
||||||
if (startObj is ObjReal) {
|
|
||||||
scope.raiseIllegalState("Real range requires explicit step")
|
|
||||||
}
|
|
||||||
scope.raiseIllegalState("Range of ${startObj.objClass.className} requires explicit step")
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun directionMismatch(scope: Scope, step: Obj): Boolean {
|
|
||||||
if (end == null || end.isNull) return false
|
|
||||||
val startObj = start ?: ObjNull
|
|
||||||
if (startObj is ObjChar && end !is ObjChar) return false
|
|
||||||
val cmp = startObj.compareTo(scope, end)
|
|
||||||
if (cmp == -2) return false
|
|
||||||
if (cmp == 0) return false
|
|
||||||
val stepSign = when {
|
|
||||||
startObj is ObjChar && step is ObjInt -> step.value.compareTo(0)
|
|
||||||
step is Numeric -> step.doubleValue.compareTo(0.0)
|
|
||||||
else -> return false
|
|
||||||
}
|
|
||||||
return (cmp < 0 && stepSign < 0) || (cmp > 0 && stepSign > 0)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun buildIterator(scope: Scope): Obj {
|
|
||||||
if (isOpenStart) scope.raiseIllegalState("Range with open start is not iterable")
|
|
||||||
val explicitStep = explicitStepOrNull()
|
|
||||||
if (isOpenEnd && explicitStep == null) {
|
|
||||||
scope.raiseIllegalState("Open-ended range requires explicit step to iterate")
|
|
||||||
}
|
|
||||||
val stepValue = resolveStep(scope, explicitStep)
|
|
||||||
val mismatch = directionMismatch(scope, stepValue)
|
|
||||||
if (net.sergeych.lyng.PerfFlags.RANGE_FAST_ITER) {
|
|
||||||
val s = start
|
|
||||||
val e = end
|
|
||||||
if (!mismatch && stepValue is ObjInt && stepValue.value == 1L && s is ObjInt && e is ObjInt) {
|
|
||||||
val startVal = s.value.toInt()
|
|
||||||
val endExclusive = (if (isEndInclusive) e.value.toInt() + 1 else e.value.toInt())
|
|
||||||
if (startVal <= endExclusive) {
|
|
||||||
return ObjFastIntRangeIterator(startVal, endExclusive)
|
|
||||||
}
|
}
|
||||||
|
ObjRangeIterator(self).apply { init() }
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return ObjRangeIterator(this, stepValue, mismatch)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -17,55 +17,57 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import net.sergeych.lyng.PerfFlags
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
|
||||||
class ObjRangeIterator(
|
class ObjRangeIterator(val self: ObjRange) : Obj() {
|
||||||
private val self: ObjRange,
|
|
||||||
private val step: Obj,
|
|
||||||
private val directionMismatch: Boolean
|
|
||||||
) : Obj() {
|
|
||||||
|
|
||||||
private var current: Obj? = null
|
private var nextIndex = 0
|
||||||
private var initialized = false
|
private var lastIndex = 0
|
||||||
|
private var isCharRange: Boolean = false
|
||||||
|
|
||||||
override val objClass: ObjClass get() = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
private fun ensureInit() {
|
fun Scope.init() {
|
||||||
if (!initialized) {
|
val s = self.start
|
||||||
current = self.start ?: ObjNull
|
val e = self.end
|
||||||
initialized = true
|
if (s is ObjInt && e is ObjInt) {
|
||||||
}
|
lastIndex = if (self.isEndInclusive)
|
||||||
}
|
(e.value - s.value + 1).toInt()
|
||||||
|
else
|
||||||
suspend fun hasNext(scope: Scope): Boolean {
|
(e.value - s.value).toInt()
|
||||||
if (directionMismatch) return false
|
} else if (s is ObjChar && e is ObjChar) {
|
||||||
ensureInit()
|
isCharRange = true
|
||||||
val cur = current ?: return false
|
lastIndex = if (self.isEndInclusive)
|
||||||
return self.contains(scope, cur)
|
(e.value.code - s.value.code + 1)
|
||||||
}
|
else
|
||||||
|
(e.value.code - s.value.code)
|
||||||
suspend fun next(scope: Scope): Obj {
|
|
||||||
if (!hasNext(scope)) {
|
|
||||||
scope.raiseError(ObjIterationFinishedException(scope))
|
|
||||||
}
|
|
||||||
val result = current ?: scope.raiseError("iterator error: missing current value")
|
|
||||||
current = advance(scope, result)
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun advance(scope: Scope, value: Obj): Obj =
|
|
||||||
if (value is ObjChar) {
|
|
||||||
val delta = (step as? ObjInt)
|
|
||||||
?: scope.raiseIllegalState("Char range step must be Int")
|
|
||||||
ObjChar((value.value.code + delta.value.toInt()).toChar())
|
|
||||||
} else {
|
} else {
|
||||||
value.plus(scope, step)
|
raiseError("not implemented iterator for range of $this")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun hasNext(): Boolean = nextIndex < lastIndex
|
||||||
|
|
||||||
|
fun next(scope: Scope): Obj =
|
||||||
|
if (nextIndex < lastIndex) {
|
||||||
|
val start = self.start
|
||||||
|
val x = if (start is ObjInt)
|
||||||
|
start.value + nextIndex++
|
||||||
|
else if (start is ObjChar)
|
||||||
|
start.value.code.toLong() + nextIndex++
|
||||||
|
else
|
||||||
|
scope.raiseError("iterator error: unsupported range start")
|
||||||
|
if (isCharRange) ObjChar(x.toInt().toChar()) else ObjInt.of(x)
|
||||||
|
}
|
||||||
|
else {
|
||||||
|
scope.raiseError(ObjIterationFinishedException(scope))
|
||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val type = ObjClass("RangeIterator", ObjIterator).apply {
|
val type = ObjClass("RangeIterator", ObjIterator).apply {
|
||||||
addFn("hasNext") {
|
addFn("hasNext") {
|
||||||
thisAs<ObjRangeIterator>().hasNext(this).toObj()
|
thisAs<ObjRangeIterator>().hasNext().toObj()
|
||||||
}
|
}
|
||||||
addFn("next") {
|
addFn("next") {
|
||||||
thisAs<ObjRangeIterator>().next(this)
|
thisAs<ObjRangeIterator>().next(this)
|
||||||
|
|||||||
@@ -38,10 +38,6 @@ data class ObjRecord(
|
|||||||
var delegate: Obj? = null,
|
var delegate: Obj? = null,
|
||||||
/** The receiver object to resolve this member against (for instance fields/methods). */
|
/** The receiver object to resolve this member against (for instance fields/methods). */
|
||||||
var receiver: Obj? = null,
|
var receiver: Obj? = null,
|
||||||
val callSignature: net.sergeych.lyng.CallSignature? = null,
|
|
||||||
val memberName: String? = null,
|
|
||||||
val fieldId: Int? = null,
|
|
||||||
val methodId: Int? = null,
|
|
||||||
) {
|
) {
|
||||||
val effectiveWriteVisibility: Visibility get() = writeVisibility ?: visibility
|
val effectiveWriteVisibility: Visibility get() = writeVisibility ?: visibility
|
||||||
enum class Type(val comparable: Boolean = false,val serializable: Boolean = false) {
|
enum class Type(val comparable: Boolean = false,val serializable: Boolean = false) {
|
||||||
@@ -63,4 +59,4 @@ data class ObjRecord(
|
|||||||
@Suppress("unused")
|
@Suppress("unused")
|
||||||
fun qualifiedName(name: String): String =
|
fun qualifiedName(name: String): String =
|
||||||
"${importedFrom?.packageName ?: "anonymous"}.$name"
|
"${importedFrom?.packageName ?: "anonymous"}.$name"
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -18,10 +18,8 @@
|
|||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
import net.sergeych.lyng.PerfFlags
|
import net.sergeych.lyng.PerfFlags
|
||||||
import net.sergeych.lyng.Pos
|
|
||||||
import net.sergeych.lyng.RegexCache
|
import net.sergeych.lyng.RegexCache
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.Statement
|
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
|
|
||||||
class ObjRegex(val regex: Regex) : Obj() {
|
class ObjRegex(val regex: Regex) : Obj() {
|
||||||
@@ -74,19 +72,6 @@ class ObjRegex(val regex: Regex) : Obj() {
|
|||||||
val s = requireOnlyArg<ObjString>().value
|
val s = requireOnlyArg<ObjString>().value
|
||||||
ObjList(thisAs<ObjRegex>().regex.findAll(s).map { ObjRegexMatch(it) }.toMutableList())
|
ObjList(thisAs<ObjRegex>().regex.findAll(s).map { ObjRegexMatch(it) }.toMutableList())
|
||||||
}
|
}
|
||||||
createField(
|
|
||||||
name = "operatorMatch",
|
|
||||||
initialValue = object : Statement() {
|
|
||||||
override val pos: Pos = Pos.builtIn
|
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val other = scope.args.firstAndOnly(pos)
|
|
||||||
val targetScope = scope.parent ?: scope
|
|
||||||
return (scope.thisObj as ObjRegex).operatorMatch(targetScope, other)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
type = ObjRecord.Type.Fun
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -159,4 +144,4 @@ class ObjRegexMatch(val match: MatchResult) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -22,10 +22,8 @@ import kotlinx.serialization.Serializable
|
|||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import net.sergeych.lyng.PerfFlags
|
import net.sergeych.lyng.PerfFlags
|
||||||
import net.sergeych.lyng.Pos
|
|
||||||
import net.sergeych.lyng.RegexCache
|
import net.sergeych.lyng.RegexCache
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.Statement
|
|
||||||
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.LynonEncoder
|
||||||
@@ -340,36 +338,6 @@ data class ObjString(val value: String) : Obj() {
|
|||||||
}
|
}
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
createField(
|
|
||||||
name = "re",
|
|
||||||
initialValue = ObjProperty(
|
|
||||||
name = "re",
|
|
||||||
getter = object : Statement() {
|
|
||||||
override val pos: Pos = Pos.builtIn
|
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val pattern = (scope.thisObj as ObjString).value
|
|
||||||
val re = if (PerfFlags.REGEX_CACHE) RegexCache.get(pattern) else pattern.toRegex()
|
|
||||||
return ObjRegex(re)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
setter = null
|
|
||||||
),
|
|
||||||
type = ObjRecord.Type.Property
|
|
||||||
)
|
|
||||||
createField(
|
|
||||||
name = "operatorMatch",
|
|
||||||
initialValue = object : Statement() {
|
|
||||||
override val pos: Pos = Pos.builtIn
|
|
||||||
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val other = scope.args.firstAndOnly(pos)
|
|
||||||
val targetScope = scope.parent ?: scope
|
|
||||||
return (scope.thisObj as ObjString).operatorMatch(targetScope, other)
|
|
||||||
}
|
|
||||||
},
|
|
||||||
type = ObjRecord.Type.Fun
|
|
||||||
)
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,229 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.Scope
|
|
||||||
import net.sergeych.lyng.TypeDecl
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Runtime wrapper for a type expression (including unions/intersections) used by `is` checks.
|
|
||||||
*/
|
|
||||||
class ObjTypeExpr(val typeDecl: TypeDecl) : Obj() {
|
|
||||||
override suspend fun equals(scope: Scope, other: Obj): Boolean {
|
|
||||||
val otherDecl = typeDeclFromObj(scope, other) ?: return false
|
|
||||||
val leftKey = typeDeclKey(normalizeTypeDecl(scope, typeDecl))
|
|
||||||
val rightKey = typeDeclKey(normalizeTypeDecl(scope, otherDecl))
|
|
||||||
return leftKey == rightKey
|
|
||||||
}
|
|
||||||
|
|
||||||
override suspend fun contains(scope: Scope, other: Obj): Boolean {
|
|
||||||
val leftDecl = typeDeclFromObj(scope, other) ?: return false
|
|
||||||
val rightDecl = normalizeTypeDecl(scope, typeDecl)
|
|
||||||
return typeDeclIsSubtype(scope, leftDecl, rightDecl)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun matchesTypeDecl(scope: Scope, value: Obj, typeDecl: TypeDecl): Boolean {
|
|
||||||
if (value === ObjNull) {
|
|
||||||
return typeDecl.isNullable || typeDecl is TypeDecl.TypeNullableAny
|
|
||||||
}
|
|
||||||
fun resolveClassFromScope(typeName: String): ObjClass? {
|
|
||||||
val direct = scope[typeName]?.value as? ObjClass
|
|
||||||
if (direct != null) return direct
|
|
||||||
val simple = typeName.substringAfterLast('.')
|
|
||||||
return scope[simple]?.value as? ObjClass
|
|
||||||
}
|
|
||||||
return when (typeDecl) {
|
|
||||||
TypeDecl.TypeAny -> true
|
|
||||||
TypeDecl.TypeNullableAny -> true
|
|
||||||
is TypeDecl.TypeVar -> {
|
|
||||||
val cls = (scope[typeDecl.name]?.value as? ObjClass)
|
|
||||||
if (cls != null) value.isInstanceOf(cls) else value.isInstanceOf(typeDecl.name)
|
|
||||||
}
|
|
||||||
is TypeDecl.Simple -> {
|
|
||||||
val cls = resolveClassFromScope(typeDecl.name)
|
|
||||||
if (cls != null) value.isInstanceOf(cls) else value.isInstanceOf(typeDecl.name.substringAfterLast('.'))
|
|
||||||
}
|
|
||||||
is TypeDecl.Generic -> {
|
|
||||||
val cls = resolveClassFromScope(typeDecl.name)
|
|
||||||
if (cls != null) value.isInstanceOf(cls) else value.isInstanceOf(typeDecl.name.substringAfterLast('.'))
|
|
||||||
}
|
|
||||||
is TypeDecl.Function -> value.isInstanceOf("Callable")
|
|
||||||
is TypeDecl.Union -> typeDecl.options.any { matchesTypeDecl(scope, value, it) }
|
|
||||||
is TypeDecl.Intersection -> typeDecl.options.all { matchesTypeDecl(scope, value, it) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun typeDeclFromObj(scope: Scope, value: Obj): TypeDecl? {
|
|
||||||
return when (value) {
|
|
||||||
is ObjTypeExpr -> normalizeTypeDecl(scope, value.typeDecl)
|
|
||||||
is ObjClass -> TypeDecl.Simple(value.className, false)
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
internal fun typeDeclIsSubtype(scope: Scope, left: TypeDecl, right: TypeDecl): Boolean {
|
|
||||||
val lNorm = normalizeTypeDecl(scope, left)
|
|
||||||
val rNorm = normalizeTypeDecl(scope, right)
|
|
||||||
val lNullable = lNorm.isNullable || lNorm is TypeDecl.TypeNullableAny
|
|
||||||
val rNullable = rNorm.isNullable || rNorm is TypeDecl.TypeNullableAny
|
|
||||||
if (lNullable && !rNullable) return false
|
|
||||||
val l = stripNullable(lNorm)
|
|
||||||
val r = stripNullable(rNorm)
|
|
||||||
if (r == TypeDecl.TypeAny || r == TypeDecl.TypeNullableAny) return true
|
|
||||||
if (l == TypeDecl.TypeAny) return r == TypeDecl.TypeAny || r == TypeDecl.TypeNullableAny
|
|
||||||
if (l == TypeDecl.TypeNullableAny) return r == TypeDecl.TypeNullableAny
|
|
||||||
return when (l) {
|
|
||||||
is TypeDecl.Union -> l.options.all { typeDeclIsSubtype(scope, it, r) }
|
|
||||||
is TypeDecl.Intersection -> l.options.any { typeDeclIsSubtype(scope, it, r) }
|
|
||||||
else -> when (r) {
|
|
||||||
is TypeDecl.Union -> r.options.any { typeDeclIsSubtype(scope, l, it) }
|
|
||||||
is TypeDecl.Intersection -> r.options.all { typeDeclIsSubtype(scope, l, it) }
|
|
||||||
is TypeDecl.Simple, is TypeDecl.Generic, is TypeDecl.Function -> {
|
|
||||||
val leftClass = resolveTypeDeclClass(scope, l) ?: return false
|
|
||||||
val rightClass = resolveTypeDeclClass(scope, r) ?: return false
|
|
||||||
leftClass == rightClass || leftClass.allParentsSet.contains(rightClass)
|
|
||||||
}
|
|
||||||
else -> false
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun normalizeTypeDecl(scope: Scope, decl: TypeDecl): TypeDecl {
|
|
||||||
val resolved = if (decl is TypeDecl.TypeVar) {
|
|
||||||
val bound = scope[decl.name]?.value
|
|
||||||
when (bound) {
|
|
||||||
is ObjTypeExpr -> bound.typeDecl
|
|
||||||
is ObjClass -> TypeDecl.Simple(bound.className, decl.isNullable)
|
|
||||||
else -> decl
|
|
||||||
}
|
|
||||||
} else decl
|
|
||||||
return when (resolved) {
|
|
||||||
is TypeDecl.Union -> normalizeUnion(scope, resolved)
|
|
||||||
is TypeDecl.Intersection -> normalizeIntersection(scope, resolved)
|
|
||||||
else -> resolved
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun normalizeUnion(scope: Scope, decl: TypeDecl.Union): TypeDecl {
|
|
||||||
val options = mutableListOf<TypeDecl>()
|
|
||||||
var nullable = decl.isNullable
|
|
||||||
for (opt in decl.options) {
|
|
||||||
val norm = normalizeTypeDecl(scope, opt)
|
|
||||||
if (norm is TypeDecl.TypeNullableAny) nullable = true
|
|
||||||
val base = stripNullable(norm)
|
|
||||||
if (base == TypeDecl.TypeAny) return if (nullable) TypeDecl.TypeNullableAny else TypeDecl.TypeAny
|
|
||||||
if (base is TypeDecl.Union) {
|
|
||||||
options.addAll(base.options)
|
|
||||||
} else {
|
|
||||||
options += base
|
|
||||||
}
|
|
||||||
nullable = nullable || norm.isNullable
|
|
||||||
}
|
|
||||||
val unique = options.distinctBy { typeDeclKey(it) }.sortedBy { typeDeclKey(it) }
|
|
||||||
val base = if (unique.size == 1) unique[0] else TypeDecl.Union(unique, nullable = false)
|
|
||||||
return if (nullable) makeNullable(base) else base
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun normalizeIntersection(scope: Scope, decl: TypeDecl.Intersection): TypeDecl {
|
|
||||||
val options = mutableListOf<TypeDecl>()
|
|
||||||
var nullable = decl.isNullable
|
|
||||||
for (opt in decl.options) {
|
|
||||||
val norm = normalizeTypeDecl(scope, opt)
|
|
||||||
val base = stripNullable(norm)
|
|
||||||
if (base == TypeDecl.TypeAny) {
|
|
||||||
nullable = nullable || norm.isNullable
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if (base is TypeDecl.Intersection) {
|
|
||||||
options.addAll(base.options)
|
|
||||||
} else {
|
|
||||||
options += base
|
|
||||||
}
|
|
||||||
nullable = nullable || norm.isNullable
|
|
||||||
}
|
|
||||||
val unique = options.distinctBy { typeDeclKey(it) }.sortedBy { typeDeclKey(it) }
|
|
||||||
val base = when {
|
|
||||||
unique.isEmpty() -> TypeDecl.TypeAny
|
|
||||||
unique.size == 1 -> unique[0]
|
|
||||||
else -> TypeDecl.Intersection(unique, nullable = false)
|
|
||||||
}
|
|
||||||
return if (nullable) makeNullable(base) else base
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun stripNullable(type: TypeDecl): TypeDecl {
|
|
||||||
return if (!type.isNullable && type !is TypeDecl.TypeNullableAny) {
|
|
||||||
type
|
|
||||||
} else {
|
|
||||||
when (type) {
|
|
||||||
is TypeDecl.Function -> type.copy(nullable = false)
|
|
||||||
is TypeDecl.TypeVar -> type.copy(nullable = false)
|
|
||||||
is TypeDecl.Union -> type.copy(nullable = false)
|
|
||||||
is TypeDecl.Intersection -> type.copy(nullable = false)
|
|
||||||
is TypeDecl.Simple -> TypeDecl.Simple(type.name, false)
|
|
||||||
is TypeDecl.Generic -> TypeDecl.Generic(type.name, type.args, false)
|
|
||||||
else -> TypeDecl.TypeAny
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun makeNullable(type: TypeDecl): TypeDecl {
|
|
||||||
return when (type) {
|
|
||||||
TypeDecl.TypeAny -> TypeDecl.TypeNullableAny
|
|
||||||
TypeDecl.TypeNullableAny -> type
|
|
||||||
is TypeDecl.Function -> type.copy(nullable = true)
|
|
||||||
is TypeDecl.TypeVar -> type.copy(nullable = true)
|
|
||||||
is TypeDecl.Union -> type.copy(nullable = true)
|
|
||||||
is TypeDecl.Intersection -> type.copy(nullable = true)
|
|
||||||
is TypeDecl.Simple -> TypeDecl.Simple(type.name, true)
|
|
||||||
is TypeDecl.Generic -> TypeDecl.Generic(type.name, type.args, true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun typeDeclKey(type: TypeDecl): String = when (type) {
|
|
||||||
TypeDecl.TypeAny -> "Any"
|
|
||||||
TypeDecl.TypeNullableAny -> "Any?"
|
|
||||||
is TypeDecl.Simple -> "S:${type.name}"
|
|
||||||
is TypeDecl.Generic -> "G:${type.name}<${type.args.joinToString(",") { typeDeclKey(it) }}>"
|
|
||||||
is TypeDecl.Function -> "F:(${type.params.joinToString(",") { typeDeclKey(it) }})->${typeDeclKey(type.returnType)}"
|
|
||||||
is TypeDecl.TypeVar -> "V:${type.name}"
|
|
||||||
is TypeDecl.Union -> "U:${type.options.joinToString("|") { typeDeclKey(it) }}"
|
|
||||||
is TypeDecl.Intersection -> "I:${type.options.joinToString("&") { typeDeclKey(it) }}"
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveTypeDeclClass(scope: Scope, type: TypeDecl): ObjClass? {
|
|
||||||
return when (type) {
|
|
||||||
is TypeDecl.Simple -> {
|
|
||||||
val direct = scope[type.name]?.value as? ObjClass
|
|
||||||
direct ?: scope[type.name.substringAfterLast('.')]?.value as? ObjClass
|
|
||||||
}
|
|
||||||
is TypeDecl.Generic -> {
|
|
||||||
val direct = scope[type.name]?.value as? ObjClass
|
|
||||||
direct ?: scope[type.name.substringAfterLast('.')]?.value as? ObjClass
|
|
||||||
}
|
|
||||||
is TypeDecl.Function -> scope["Callable"]?.value as? ObjClass
|
|
||||||
is TypeDecl.TypeVar -> {
|
|
||||||
val bound = scope[type.name]?.value
|
|
||||||
when (bound) {
|
|
||||||
is ObjClass -> bound
|
|
||||||
is ObjTypeExpr -> resolveTypeDeclClass(scope, bound.typeDecl)
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -68,17 +68,11 @@ abstract class ImportProvider(
|
|||||||
|
|
||||||
suspend fun newStdScope(pos: Pos = Pos.builtIn): Scope =
|
suspend fun newStdScope(pos: Pos = Pos.builtIn): Scope =
|
||||||
cachedStdScope.get {
|
cachedStdScope.get {
|
||||||
val module = newModuleAt(pos)
|
newModuleAt(pos).also {
|
||||||
val stdlib = prepareImport(pos, "lyng.stdlib", null)
|
it.eval("import lyng.stdlib\n")
|
||||||
val plan = LinkedHashMap<String, Int>()
|
|
||||||
for ((name, record) in stdlib.objects) {
|
|
||||||
if (!record.visibility.isPublic) continue
|
|
||||||
plan[name] = plan.size
|
|
||||||
}
|
}
|
||||||
if (plan.isNotEmpty()) module.applySlotPlan(plan)
|
|
||||||
stdlib.importInto(module, null)
|
|
||||||
module
|
|
||||||
}.createChildScope()
|
}.createChildScope()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
@@ -1,78 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.resolution
|
|
||||||
|
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Pos
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.pacman.ImportProvider
|
|
||||||
|
|
||||||
enum class SymbolOrigin {
|
|
||||||
LOCAL,
|
|
||||||
OUTER,
|
|
||||||
MODULE,
|
|
||||||
MEMBER,
|
|
||||||
PARAM
|
|
||||||
}
|
|
||||||
|
|
||||||
data class ResolvedSymbol(
|
|
||||||
val name: String,
|
|
||||||
val origin: SymbolOrigin,
|
|
||||||
val slotIndex: Int,
|
|
||||||
val pos: Pos,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class CaptureInfo(
|
|
||||||
val name: String,
|
|
||||||
val origin: SymbolOrigin,
|
|
||||||
val slotIndex: Int,
|
|
||||||
val isMutable: Boolean,
|
|
||||||
val pos: Pos,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class ResolutionError(
|
|
||||||
val message: String,
|
|
||||||
val pos: Pos,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class ResolutionWarning(
|
|
||||||
val message: String,
|
|
||||||
val pos: Pos,
|
|
||||||
)
|
|
||||||
|
|
||||||
data class ResolutionReport(
|
|
||||||
val moduleName: String,
|
|
||||||
val symbols: List<ResolvedSymbol>,
|
|
||||||
val captures: List<CaptureInfo>,
|
|
||||||
val errors: List<ResolutionError>,
|
|
||||||
val warnings: List<ResolutionWarning>,
|
|
||||||
)
|
|
||||||
|
|
||||||
object CompileTimeResolver {
|
|
||||||
suspend fun dryRun(source: Source, importProvider: ImportProvider): ResolutionReport {
|
|
||||||
val collector = ResolutionCollector(source.fileName)
|
|
||||||
Compiler.compileWithResolution(
|
|
||||||
source,
|
|
||||||
importProvider,
|
|
||||||
resolutionSink = collector,
|
|
||||||
useBytecodeStatements = false,
|
|
||||||
allowUnresolvedRefs = true
|
|
||||||
)
|
|
||||||
return collector.buildReport()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,376 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.resolution
|
|
||||||
|
|
||||||
import net.sergeych.lyng.Pos
|
|
||||||
|
|
||||||
class ResolutionCollector(private val moduleName: String) : ResolutionSink {
|
|
||||||
|
|
||||||
private data class Decl(
|
|
||||||
val name: String,
|
|
||||||
val kind: SymbolKind,
|
|
||||||
val isMutable: Boolean,
|
|
||||||
val pos: Pos,
|
|
||||||
val isOverride: Boolean
|
|
||||||
)
|
|
||||||
|
|
||||||
private data class Ref(
|
|
||||||
val name: String,
|
|
||||||
val pos: Pos,
|
|
||||||
val qualifier: String? = null
|
|
||||||
)
|
|
||||||
|
|
||||||
private data class ReflectRef(
|
|
||||||
val name: String,
|
|
||||||
val pos: Pos
|
|
||||||
)
|
|
||||||
|
|
||||||
private data class MemberInfo(
|
|
||||||
val name: String,
|
|
||||||
val isOverride: Boolean,
|
|
||||||
val pos: Pos
|
|
||||||
)
|
|
||||||
|
|
||||||
private data class ClassInfo(
|
|
||||||
val name: String,
|
|
||||||
val bases: List<String>,
|
|
||||||
val pos: Pos,
|
|
||||||
val members: MutableMap<String, MemberInfo> = LinkedHashMap()
|
|
||||||
)
|
|
||||||
|
|
||||||
private class ScopeNode(
|
|
||||||
val kind: ScopeKind,
|
|
||||||
val pos: Pos,
|
|
||||||
val parent: ScopeNode?,
|
|
||||||
val className: String? = null,
|
|
||||||
val bases: List<String> = emptyList()
|
|
||||||
) {
|
|
||||||
val decls: LinkedHashMap<String, Decl> = LinkedHashMap()
|
|
||||||
val refs: MutableList<Ref> = ArrayList()
|
|
||||||
val memberRefs: MutableList<Ref> = ArrayList()
|
|
||||||
val reflectRefs: MutableList<ReflectRef> = ArrayList()
|
|
||||||
val captures: LinkedHashMap<String, CaptureInfo> = LinkedHashMap()
|
|
||||||
val children: MutableList<ScopeNode> = ArrayList()
|
|
||||||
}
|
|
||||||
|
|
||||||
private var root: ScopeNode? = null
|
|
||||||
private var current: ScopeNode? = null
|
|
||||||
|
|
||||||
private val symbols = ArrayList<ResolvedSymbol>()
|
|
||||||
private val captures = LinkedHashMap<String, CaptureInfo>()
|
|
||||||
private val errors = ArrayList<ResolutionError>()
|
|
||||||
private val warnings = ArrayList<ResolutionWarning>()
|
|
||||||
private val classes = LinkedHashMap<String, ClassInfo>()
|
|
||||||
|
|
||||||
override fun enterScope(kind: ScopeKind, pos: Pos, className: String?, bases: List<String>) {
|
|
||||||
val parent = current
|
|
||||||
val node = ScopeNode(kind, pos, parent, className, bases)
|
|
||||||
if (root == null) {
|
|
||||||
root = node
|
|
||||||
}
|
|
||||||
parent?.children?.add(node)
|
|
||||||
current = node
|
|
||||||
if (kind == ScopeKind.CLASS && className != null) {
|
|
||||||
classes.getOrPut(className) { ClassInfo(className, bases.toList(), pos) }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun exitScope(pos: Pos) {
|
|
||||||
current = current?.parent
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun declareClass(name: String, bases: List<String>, pos: Pos) {
|
|
||||||
val existing = classes[name]
|
|
||||||
if (existing == null) {
|
|
||||||
classes[name] = ClassInfo(name, bases.toList(), pos)
|
|
||||||
} else if (existing.bases.isEmpty() && bases.isNotEmpty()) {
|
|
||||||
classes[name] = existing.copy(bases = bases.toList())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun declareSymbol(
|
|
||||||
name: String,
|
|
||||||
kind: SymbolKind,
|
|
||||||
isMutable: Boolean,
|
|
||||||
pos: Pos,
|
|
||||||
isOverride: Boolean
|
|
||||||
) {
|
|
||||||
val node = current ?: return
|
|
||||||
node.decls[name] = Decl(name, kind, isMutable, pos, isOverride)
|
|
||||||
if (kind == SymbolKind.LOCAL || kind == SymbolKind.PARAM) {
|
|
||||||
val classScope = findNearestClassScope(node)
|
|
||||||
if (classScope != null && classScope.decls.containsKey(name)) {
|
|
||||||
warnings += ResolutionWarning("shadowing member: $name", pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (kind == SymbolKind.MEMBER) {
|
|
||||||
val classScope = findNearestClassScope(node)
|
|
||||||
val className = classScope?.className
|
|
||||||
if (className != null) {
|
|
||||||
val info = classes.getOrPut(className) { ClassInfo(className, classScope.bases, classScope.pos) }
|
|
||||||
info.members[name] = MemberInfo(name, isOverride, pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
symbols += ResolvedSymbol(
|
|
||||||
name = name,
|
|
||||||
origin = originForDecl(node, kind),
|
|
||||||
slotIndex = -1,
|
|
||||||
pos = pos
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun reference(name: String, pos: Pos) {
|
|
||||||
val node = current ?: return
|
|
||||||
node.refs += Ref(name, pos)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun referenceMember(name: String, pos: Pos, qualifier: String?) {
|
|
||||||
val node = current ?: return
|
|
||||||
node.memberRefs += Ref(name, pos, qualifier)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun referenceReflection(name: String, pos: Pos) {
|
|
||||||
val node = current ?: return
|
|
||||||
node.reflectRefs += ReflectRef(name, pos)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun buildReport(): ResolutionReport {
|
|
||||||
root?.let { resolveScope(it) }
|
|
||||||
checkMiConflicts()
|
|
||||||
return ResolutionReport(
|
|
||||||
moduleName = moduleName,
|
|
||||||
symbols = symbols.toList(),
|
|
||||||
captures = captures.values.toList(),
|
|
||||||
errors = errors.toList(),
|
|
||||||
warnings = warnings.toList()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveScope(node: ScopeNode) {
|
|
||||||
for (ref in node.refs) {
|
|
||||||
if (ref.name == "this") continue
|
|
||||||
if (ref.name == "scope") continue
|
|
||||||
val resolved = resolveName(node, ref)
|
|
||||||
if (!resolved) {
|
|
||||||
errors += ResolutionError("unresolved name: ${ref.name}", ref.pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (ref in node.memberRefs) {
|
|
||||||
val resolved = resolveMemberName(node, ref)
|
|
||||||
if (!resolved) {
|
|
||||||
errors += ResolutionError("unresolved member: ${ref.name}", ref.pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (ref in node.reflectRefs) {
|
|
||||||
val resolved = resolveName(node, Ref(ref.name, ref.pos)) ||
|
|
||||||
resolveMemberName(node, Ref(ref.name, ref.pos))
|
|
||||||
if (!resolved) {
|
|
||||||
errors += ResolutionError("unresolved reflected name: ${ref.name}", ref.pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
for (child in node.children) {
|
|
||||||
resolveScope(child)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveName(node: ScopeNode, ref: Ref): Boolean {
|
|
||||||
if (ref.name.contains('.')) return true
|
|
||||||
var scope: ScopeNode? = node
|
|
||||||
while (scope != null) {
|
|
||||||
val decl = scope.decls[ref.name]
|
|
||||||
if (decl != null) {
|
|
||||||
if (scope !== node) {
|
|
||||||
recordCapture(node, decl, scope)
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
scope = scope.parent
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun recordCapture(owner: ScopeNode, decl: Decl, targetScope: ScopeNode) {
|
|
||||||
if (owner.captures.containsKey(decl.name)) return
|
|
||||||
val origin = when (targetScope.kind) {
|
|
||||||
ScopeKind.MODULE -> SymbolOrigin.MODULE
|
|
||||||
else -> SymbolOrigin.OUTER
|
|
||||||
}
|
|
||||||
val capture = CaptureInfo(
|
|
||||||
name = decl.name,
|
|
||||||
origin = origin,
|
|
||||||
slotIndex = -1,
|
|
||||||
isMutable = decl.isMutable,
|
|
||||||
pos = decl.pos
|
|
||||||
)
|
|
||||||
owner.captures[decl.name] = capture
|
|
||||||
captures[decl.name] = capture
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveMemberName(node: ScopeNode, ref: Ref): Boolean {
|
|
||||||
val classScope = findNearestClassScope(node) ?: return false
|
|
||||||
val className = classScope.className ?: return false
|
|
||||||
val qualifier = ref.qualifier
|
|
||||||
return if (qualifier != null) {
|
|
||||||
resolveQualifiedMember(className, qualifier, ref.name, ref.pos)
|
|
||||||
} else {
|
|
||||||
resolveMemberInClass(className, ref.name, ref.pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun findNearestClassScope(node: ScopeNode): ScopeNode? {
|
|
||||||
var scope: ScopeNode? = node
|
|
||||||
while (scope != null) {
|
|
||||||
if (scope.kind == ScopeKind.CLASS) return scope
|
|
||||||
scope = scope.parent
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun originForDecl(scope: ScopeNode, kind: SymbolKind): SymbolOrigin {
|
|
||||||
return when (kind) {
|
|
||||||
SymbolKind.PARAM -> SymbolOrigin.PARAM
|
|
||||||
SymbolKind.MEMBER -> SymbolOrigin.MEMBER
|
|
||||||
else -> when (scope.kind) {
|
|
||||||
ScopeKind.MODULE -> SymbolOrigin.MODULE
|
|
||||||
ScopeKind.CLASS -> SymbolOrigin.MEMBER
|
|
||||||
else -> SymbolOrigin.LOCAL
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveMemberInClass(className: String, member: String, pos: Pos): Boolean {
|
|
||||||
val info = classes[className] ?: return false
|
|
||||||
val currentMember = info.members[member]
|
|
||||||
val definers = findDefiningClasses(className, member)
|
|
||||||
if (currentMember != null) {
|
|
||||||
if (definers.size > 1 && !currentMember.isOverride) {
|
|
||||||
errors += ResolutionError("override required for $member in $className", pos)
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
if (definers.size > 1) {
|
|
||||||
errors += ResolutionError("ambiguous member '$member' in $className", pos)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
return definers.isNotEmpty()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun resolveQualifiedMember(className: String, qualifier: String, member: String, pos: Pos): Boolean {
|
|
||||||
val mro = linearize(className)
|
|
||||||
val idx = mro.indexOf(qualifier)
|
|
||||||
if (idx < 0) return false
|
|
||||||
for (name in mro.drop(idx)) {
|
|
||||||
val info = classes[name]
|
|
||||||
if (info?.members?.containsKey(member) == true) return true
|
|
||||||
}
|
|
||||||
errors += ResolutionError("member '$member' not found in $qualifier", pos)
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun findDefiningClasses(className: String, member: String): List<String> {
|
|
||||||
val parents = linearize(className).drop(1)
|
|
||||||
val raw = parents.filter { classes[it]?.members?.containsKey(member) == true }
|
|
||||||
if (raw.size <= 1) return raw
|
|
||||||
val filtered = raw.toMutableList()
|
|
||||||
val iterator = raw.iterator()
|
|
||||||
while (iterator.hasNext()) {
|
|
||||||
val candidate = iterator.next()
|
|
||||||
for (other in raw) {
|
|
||||||
if (candidate == other) continue
|
|
||||||
if (linearize(other).contains(candidate)) {
|
|
||||||
filtered.remove(candidate)
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return filtered
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun linearize(className: String, visited: MutableMap<String, List<String>> = mutableMapOf()): List<String> {
|
|
||||||
visited[className]?.let { return it }
|
|
||||||
val info = classes[className]
|
|
||||||
val parents = info?.bases ?: emptyList()
|
|
||||||
if (parents.isEmpty()) {
|
|
||||||
val single = listOf(className)
|
|
||||||
visited[className] = single
|
|
||||||
return single
|
|
||||||
}
|
|
||||||
val parentLinearizations = parents.map { linearize(it, visited).toMutableList() }
|
|
||||||
val merge = mutableListOf<MutableList<String>>()
|
|
||||||
merge.addAll(parentLinearizations)
|
|
||||||
merge.add(parents.toMutableList())
|
|
||||||
val merged = c3Merge(merge)
|
|
||||||
val result = listOf(className) + merged
|
|
||||||
visited[className] = result
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun c3Merge(seqs: MutableList<MutableList<String>>): List<String> {
|
|
||||||
val result = mutableListOf<String>()
|
|
||||||
while (seqs.isNotEmpty()) {
|
|
||||||
seqs.removeAll { it.isEmpty() }
|
|
||||||
if (seqs.isEmpty()) break
|
|
||||||
var candidate: String? = null
|
|
||||||
outer@ for (seq in seqs) {
|
|
||||||
val head = seq.first()
|
|
||||||
var inTail = false
|
|
||||||
for (other in seqs) {
|
|
||||||
if (other === seq || other.size <= 1) continue
|
|
||||||
if (other.drop(1).contains(head)) {
|
|
||||||
inTail = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!inTail) {
|
|
||||||
candidate = head
|
|
||||||
break@outer
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val picked = candidate ?: run {
|
|
||||||
errors += ResolutionError("C3 MRO failed for $moduleName", Pos.builtIn)
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
result += picked
|
|
||||||
for (seq in seqs) {
|
|
||||||
if (seq.isNotEmpty() && seq.first() == picked) {
|
|
||||||
seq.removeAt(0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun checkMiConflicts() {
|
|
||||||
for (info in classes.values) {
|
|
||||||
val baseNames = linearize(info.name).drop(1)
|
|
||||||
if (baseNames.isEmpty()) continue
|
|
||||||
val baseMemberNames = linkedSetOf<String>()
|
|
||||||
for (base in baseNames) {
|
|
||||||
classes[base]?.members?.keys?.let { baseMemberNames.addAll(it) }
|
|
||||||
}
|
|
||||||
for (member in baseMemberNames) {
|
|
||||||
val definers = findDefiningClasses(info.name, member)
|
|
||||||
if (definers.size <= 1) continue
|
|
||||||
val current = info.members[member]
|
|
||||||
if (current == null || !current.isOverride) {
|
|
||||||
errors += ResolutionError("ambiguous member '$member' in ${info.name}", info.pos)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,52 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.resolution
|
|
||||||
|
|
||||||
import net.sergeych.lyng.Pos
|
|
||||||
|
|
||||||
enum class ScopeKind {
|
|
||||||
MODULE,
|
|
||||||
FUNCTION,
|
|
||||||
BLOCK,
|
|
||||||
CLASS
|
|
||||||
}
|
|
||||||
|
|
||||||
enum class SymbolKind {
|
|
||||||
LOCAL,
|
|
||||||
PARAM,
|
|
||||||
FUNCTION,
|
|
||||||
CLASS,
|
|
||||||
ENUM,
|
|
||||||
MEMBER
|
|
||||||
}
|
|
||||||
|
|
||||||
interface ResolutionSink {
|
|
||||||
fun enterScope(kind: ScopeKind, pos: Pos, className: String? = null, bases: List<String> = emptyList()) {}
|
|
||||||
fun exitScope(pos: Pos) {}
|
|
||||||
fun declareClass(name: String, bases: List<String>, pos: Pos) {}
|
|
||||||
fun declareSymbol(
|
|
||||||
name: String,
|
|
||||||
kind: SymbolKind,
|
|
||||||
isMutable: Boolean,
|
|
||||||
pos: Pos,
|
|
||||||
isOverride: Boolean = false
|
|
||||||
) {}
|
|
||||||
fun reference(name: String, pos: Pos) {}
|
|
||||||
fun referenceMember(name: String, pos: Pos, qualifier: String? = null) {}
|
|
||||||
fun referenceReflection(name: String, pos: Pos) {}
|
|
||||||
}
|
|
||||||
@@ -19,17 +19,7 @@ package net.sergeych.lyng
|
|||||||
|
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjClass
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
import net.sergeych.lyng.obj.ObjInt
|
|
||||||
import net.sergeych.lyng.obj.ObjIterable
|
|
||||||
import net.sergeych.lyng.obj.ObjNull
|
|
||||||
import net.sergeych.lyng.obj.ObjException
|
|
||||||
import net.sergeych.lyng.obj.ObjRange
|
|
||||||
import net.sergeych.lyng.obj.ObjRecord
|
|
||||||
import net.sergeych.lyng.obj.ObjString
|
|
||||||
import net.sergeych.lyng.obj.ObjVoid
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
import net.sergeych.lyng.obj.toBool
|
|
||||||
import net.sergeych.lyng.obj.toInt
|
|
||||||
import net.sergeych.lyng.obj.toLong
|
|
||||||
|
|
||||||
fun String.toSource(name: String = "eval"): Source = Source(name, this)
|
fun String.toSource(name: String = "eval"): Source = Source(name, this)
|
||||||
|
|
||||||
@@ -73,381 +63,6 @@ abstract class Statement(
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class IfStatement(
|
|
||||||
val condition: Statement,
|
|
||||||
val ifBody: Statement,
|
|
||||||
val elseBody: Statement?,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
return if (condition.execute(scope).toBool()) {
|
|
||||||
ifBody.execute(scope)
|
|
||||||
} else {
|
|
||||||
elseBody?.execute(scope) ?: ObjVoid
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
data class ConstIntRange(val start: Long, val endExclusive: Long)
|
|
||||||
|
|
||||||
class ForInStatement(
|
|
||||||
val loopVarName: String,
|
|
||||||
val source: Statement,
|
|
||||||
val constRange: ConstIntRange?,
|
|
||||||
val body: Statement,
|
|
||||||
val elseStatement: Statement?,
|
|
||||||
val label: String?,
|
|
||||||
val canBreak: Boolean,
|
|
||||||
val loopSlotPlan: Map<String, Int>,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val forContext = scope.createChildScope(pos)
|
|
||||||
if (loopSlotPlan.isNotEmpty()) {
|
|
||||||
forContext.applySlotPlan(loopSlotPlan)
|
|
||||||
}
|
|
||||||
|
|
||||||
val loopSO = forContext.addItem(loopVarName, true, ObjNull)
|
|
||||||
val loopSlotIndex = forContext.getSlotIndexOf(loopVarName) ?: -1
|
|
||||||
|
|
||||||
if (constRange != null && PerfFlags.PRIMITIVE_FASTOPS) {
|
|
||||||
return loopIntRange(
|
|
||||||
forContext,
|
|
||||||
constRange.start,
|
|
||||||
constRange.endExclusive,
|
|
||||||
loopSO,
|
|
||||||
loopSlotIndex,
|
|
||||||
body,
|
|
||||||
elseStatement,
|
|
||||||
label,
|
|
||||||
canBreak
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val sourceObj = source.execute(forContext)
|
|
||||||
return if (sourceObj is ObjRange && sourceObj.isIntRange && !sourceObj.hasExplicitStep && PerfFlags.PRIMITIVE_FASTOPS) {
|
|
||||||
loopIntRange(
|
|
||||||
forContext,
|
|
||||||
sourceObj.start!!.toLong(),
|
|
||||||
if (sourceObj.isEndInclusive) sourceObj.end!!.toLong() + 1 else sourceObj.end!!.toLong(),
|
|
||||||
loopSO,
|
|
||||||
loopSlotIndex,
|
|
||||||
body,
|
|
||||||
elseStatement,
|
|
||||||
label,
|
|
||||||
canBreak
|
|
||||||
)
|
|
||||||
} else if (sourceObj.isInstanceOf(ObjIterable)) {
|
|
||||||
loopIterable(forContext, sourceObj, loopSO, body, elseStatement, label, canBreak)
|
|
||||||
} else {
|
|
||||||
val size = runCatching { sourceObj.readField(forContext, "size").value.toInt() }
|
|
||||||
.getOrElse {
|
|
||||||
throw ScriptError(
|
|
||||||
pos,
|
|
||||||
"object is not enumerable: no size in $sourceObj",
|
|
||||||
it
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
var result: Obj = ObjVoid
|
|
||||||
var breakCaught = false
|
|
||||||
|
|
||||||
if (size > 0) {
|
|
||||||
var current = runCatching { sourceObj.getAt(forContext, ObjInt.of(0)) }
|
|
||||||
.getOrElse {
|
|
||||||
throw ScriptError(
|
|
||||||
pos,
|
|
||||||
"object is not enumerable: no index access for ${sourceObj.inspect(scope)}",
|
|
||||||
it
|
|
||||||
)
|
|
||||||
}
|
|
||||||
var index = 0
|
|
||||||
while (true) {
|
|
||||||
loopSO.value = current
|
|
||||||
try {
|
|
||||||
result = body.execute(forContext)
|
|
||||||
} catch (lbe: LoopBreakContinueException) {
|
|
||||||
if (lbe.label == label || lbe.label == null) {
|
|
||||||
breakCaught = true
|
|
||||||
if (lbe.doContinue) continue
|
|
||||||
result = lbe.result
|
|
||||||
break
|
|
||||||
} else {
|
|
||||||
throw lbe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (++index >= size) break
|
|
||||||
current = sourceObj.getAt(forContext, ObjInt.of(index.toLong()))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!breakCaught && elseStatement != null) {
|
|
||||||
result = elseStatement.execute(scope)
|
|
||||||
}
|
|
||||||
result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun loopIntRange(
|
|
||||||
forScope: Scope,
|
|
||||||
start: Long,
|
|
||||||
end: Long,
|
|
||||||
loopVar: ObjRecord,
|
|
||||||
loopSlotIndex: Int,
|
|
||||||
body: Statement,
|
|
||||||
elseStatement: Statement?,
|
|
||||||
label: String?,
|
|
||||||
catchBreak: Boolean,
|
|
||||||
): Obj {
|
|
||||||
var result: Obj = ObjVoid
|
|
||||||
val cacheLow = ObjInt.CACHE_LOW
|
|
||||||
val cacheHigh = ObjInt.CACHE_HIGH
|
|
||||||
val useCache = start >= cacheLow && end <= cacheHigh + 1
|
|
||||||
val cache = if (useCache) ObjInt.cacheArray() else null
|
|
||||||
val useSlot = loopSlotIndex >= 0
|
|
||||||
if (catchBreak) {
|
|
||||||
if (useCache && cache != null) {
|
|
||||||
var i = start
|
|
||||||
while (i < end) {
|
|
||||||
val v = cache[(i - cacheLow).toInt()]
|
|
||||||
if (useSlot) forScope.setSlotValue(loopSlotIndex, v) else loopVar.value = v
|
|
||||||
try {
|
|
||||||
result = body.execute(forScope)
|
|
||||||
} catch (lbe: LoopBreakContinueException) {
|
|
||||||
if (lbe.label == label || lbe.label == null) {
|
|
||||||
if (lbe.doContinue) {
|
|
||||||
i++
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
return lbe.result
|
|
||||||
}
|
|
||||||
throw lbe
|
|
||||||
}
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (i in start..<end) {
|
|
||||||
val v = ObjInt.of(i)
|
|
||||||
if (useSlot) forScope.setSlotValue(loopSlotIndex, v) else loopVar.value = v
|
|
||||||
try {
|
|
||||||
result = body.execute(forScope)
|
|
||||||
} catch (lbe: LoopBreakContinueException) {
|
|
||||||
if (lbe.label == label || lbe.label == null) {
|
|
||||||
if (lbe.doContinue) continue
|
|
||||||
return lbe.result
|
|
||||||
}
|
|
||||||
throw lbe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
if (useCache && cache != null) {
|
|
||||||
var i = start
|
|
||||||
while (i < end) {
|
|
||||||
val v = cache[(i - cacheLow).toInt()]
|
|
||||||
if (useSlot) forScope.setSlotValue(loopSlotIndex, v) else loopVar.value = v
|
|
||||||
result = body.execute(forScope)
|
|
||||||
i++
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
for (i in start..<end) {
|
|
||||||
val v = ObjInt.of(i)
|
|
||||||
if (useSlot) forScope.setSlotValue(loopSlotIndex, v) else loopVar.value = v
|
|
||||||
result = body.execute(forScope)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return elseStatement?.execute(forScope) ?: result
|
|
||||||
}
|
|
||||||
|
|
||||||
private suspend fun loopIterable(
|
|
||||||
forScope: Scope,
|
|
||||||
sourceObj: Obj,
|
|
||||||
loopVar: ObjRecord,
|
|
||||||
body: Statement,
|
|
||||||
elseStatement: Statement?,
|
|
||||||
label: String?,
|
|
||||||
catchBreak: Boolean,
|
|
||||||
): Obj {
|
|
||||||
var result: Obj = ObjVoid
|
|
||||||
var breakCaught = false
|
|
||||||
sourceObj.enumerate(forScope) { item ->
|
|
||||||
loopVar.value = item
|
|
||||||
if (catchBreak) {
|
|
||||||
try {
|
|
||||||
result = body.execute(forScope)
|
|
||||||
true
|
|
||||||
} catch (lbe: LoopBreakContinueException) {
|
|
||||||
if (lbe.label == label || lbe.label == null) {
|
|
||||||
breakCaught = true
|
|
||||||
if (lbe.doContinue) true else {
|
|
||||||
result = lbe.result
|
|
||||||
false
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
throw lbe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result = body.execute(forScope)
|
|
||||||
true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!breakCaught && elseStatement != null) {
|
|
||||||
result = elseStatement.execute(forScope)
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class WhileStatement(
|
|
||||||
val condition: Statement,
|
|
||||||
val body: Statement,
|
|
||||||
val elseStatement: Statement?,
|
|
||||||
val label: String?,
|
|
||||||
val canBreak: Boolean,
|
|
||||||
val loopSlotPlan: Map<String, Int>,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
var result: Obj = ObjVoid
|
|
||||||
var wasBroken = false
|
|
||||||
while (condition.execute(scope).toBool()) {
|
|
||||||
val loopScope = scope.createChildScope().apply { skipScopeCreation = true }
|
|
||||||
if (canBreak) {
|
|
||||||
try {
|
|
||||||
result = body.execute(loopScope)
|
|
||||||
} catch (lbe: LoopBreakContinueException) {
|
|
||||||
if (lbe.label == label || lbe.label == null) {
|
|
||||||
if (lbe.doContinue) continue
|
|
||||||
result = lbe.result
|
|
||||||
wasBroken = true
|
|
||||||
break
|
|
||||||
} else {
|
|
||||||
throw lbe
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
result = body.execute(loopScope)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!wasBroken) elseStatement?.let { s -> result = s.execute(scope) }
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class DoWhileStatement(
|
|
||||||
val body: Statement,
|
|
||||||
val condition: Statement,
|
|
||||||
val elseStatement: Statement?,
|
|
||||||
val label: String?,
|
|
||||||
val loopSlotPlan: Map<String, Int>,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
var wasBroken = false
|
|
||||||
var result: Obj = ObjVoid
|
|
||||||
while (true) {
|
|
||||||
val doScope = scope.createChildScope().apply { skipScopeCreation = true }
|
|
||||||
try {
|
|
||||||
result = body.execute(doScope)
|
|
||||||
} catch (e: LoopBreakContinueException) {
|
|
||||||
if (e.label == label || e.label == null) {
|
|
||||||
if (!e.doContinue) {
|
|
||||||
result = e.result
|
|
||||||
wasBroken = true
|
|
||||||
break
|
|
||||||
}
|
|
||||||
// continue: fall through to condition check
|
|
||||||
} else {
|
|
||||||
throw e
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!condition.execute(doScope).toBool()) {
|
|
||||||
break
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!wasBroken) elseStatement?.let { s -> result = s.execute(scope) }
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class BreakStatement(
|
|
||||||
val label: String?,
|
|
||||||
val resultExpr: Statement?,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val returnValue = resultExpr?.execute(scope)
|
|
||||||
throw LoopBreakContinueException(
|
|
||||||
doContinue = false,
|
|
||||||
label = label,
|
|
||||||
result = returnValue ?: ObjVoid
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class ContinueStatement(
|
|
||||||
val label: String?,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
throw LoopBreakContinueException(
|
|
||||||
doContinue = true,
|
|
||||||
label = label,
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class ReturnStatement(
|
|
||||||
val label: String?,
|
|
||||||
val resultExpr: Statement?,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
val returnValue = resultExpr?.execute(scope) ?: ObjVoid
|
|
||||||
throw ReturnException(returnValue, label)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class ThrowStatement(
|
|
||||||
val throwExpr: Statement,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
var errorObject = throwExpr.execute(scope)
|
|
||||||
val throwScope = scope.createChildScope(pos = pos)
|
|
||||||
if (errorObject is ObjString) {
|
|
||||||
errorObject = ObjException(throwScope, errorObject.value).apply { getStackTrace() }
|
|
||||||
}
|
|
||||||
if (!errorObject.isInstanceOf(ObjException.Root)) {
|
|
||||||
throwScope.raiseError("this is not an exception object: $errorObject")
|
|
||||||
}
|
|
||||||
if (errorObject is ObjException) {
|
|
||||||
errorObject = ObjException(
|
|
||||||
errorObject.exceptionClass,
|
|
||||||
throwScope,
|
|
||||||
errorObject.message,
|
|
||||||
errorObject.extraData,
|
|
||||||
errorObject.useStackTrace
|
|
||||||
).apply { getStackTrace() }
|
|
||||||
throwScope.raiseError(errorObject)
|
|
||||||
} else {
|
|
||||||
val msg = errorObject.invokeInstanceMethod(scope, "message").toString(scope).value
|
|
||||||
throwScope.raiseError(errorObject, pos, msg)
|
|
||||||
}
|
|
||||||
return ObjVoid
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class ToBoolStatement(
|
|
||||||
val expr: Statement,
|
|
||||||
override val pos: Pos,
|
|
||||||
) : Statement() {
|
|
||||||
override suspend fun execute(scope: Scope): Obj {
|
|
||||||
return if (expr.execute(scope).toBool()) net.sergeych.lyng.obj.ObjTrue else net.sergeych.lyng.obj.ObjFalse
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
class ExpressionStatement(
|
class ExpressionStatement(
|
||||||
val ref: net.sergeych.lyng.obj.ObjRef,
|
val ref: net.sergeych.lyng.obj.ObjRef,
|
||||||
override val pos: Pos
|
override val pos: Pos
|
||||||
|
|||||||
@@ -1,467 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.tools
|
|
||||||
|
|
||||||
import net.sergeych.lyng.*
|
|
||||||
import net.sergeych.lyng.binding.Binder
|
|
||||||
import net.sergeych.lyng.binding.BindingSnapshot
|
|
||||||
import net.sergeych.lyng.binding.SymbolKind
|
|
||||||
import net.sergeych.lyng.bytecode.BytecodeStatement
|
|
||||||
import net.sergeych.lyng.bytecode.CmdDisassembler
|
|
||||||
import net.sergeych.lyng.format.LyngFormatConfig
|
|
||||||
import net.sergeych.lyng.format.LyngFormatter
|
|
||||||
import net.sergeych.lyng.highlight.HighlightSpan
|
|
||||||
import net.sergeych.lyng.highlight.SimpleLyngHighlighter
|
|
||||||
import net.sergeych.lyng.highlight.TextRange
|
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
|
||||||
import net.sergeych.lyng.miniast.*
|
|
||||||
import net.sergeych.lyng.obj.ObjClass
|
|
||||||
import net.sergeych.lyng.pacman.ImportProvider
|
|
||||||
import net.sergeych.lyng.resolution.ResolutionCollector
|
|
||||||
import net.sergeych.lyng.resolution.ResolutionReport
|
|
||||||
|
|
||||||
data class LyngAnalysisRequest(
|
|
||||||
val text: String,
|
|
||||||
val fileName: String = "<snippet>",
|
|
||||||
val importProvider: ImportProvider = Script.defaultImportManager,
|
|
||||||
val seedScope: Scope? = null
|
|
||||||
)
|
|
||||||
|
|
||||||
enum class LyngDiagnosticSeverity { Error, Warning }
|
|
||||||
|
|
||||||
data class LyngDiagnostic(
|
|
||||||
val message: String,
|
|
||||||
val severity: LyngDiagnosticSeverity,
|
|
||||||
val range: TextRange? = null,
|
|
||||||
val pos: Pos? = null
|
|
||||||
)
|
|
||||||
|
|
||||||
data class LyngAnalysisResult(
|
|
||||||
val source: Source,
|
|
||||||
val text: String,
|
|
||||||
val mini: MiniScript?,
|
|
||||||
val binding: BindingSnapshot?,
|
|
||||||
val resolution: ResolutionReport?,
|
|
||||||
val importedModules: List<String>,
|
|
||||||
val diagnostics: List<LyngDiagnostic>,
|
|
||||||
val lexicalHighlights: List<HighlightSpan>
|
|
||||||
)
|
|
||||||
|
|
||||||
data class LyngSymbolTarget(
|
|
||||||
val name: String,
|
|
||||||
val kind: SymbolKind,
|
|
||||||
val range: TextRange,
|
|
||||||
val containerName: String? = null
|
|
||||||
)
|
|
||||||
|
|
||||||
data class LyngSymbolInfo(
|
|
||||||
val target: LyngSymbolTarget,
|
|
||||||
val signature: String? = null,
|
|
||||||
val doc: MiniDoc? = null
|
|
||||||
)
|
|
||||||
|
|
||||||
enum class LyngSemanticKind {
|
|
||||||
Function,
|
|
||||||
Class,
|
|
||||||
Enum,
|
|
||||||
TypeAlias,
|
|
||||||
Value,
|
|
||||||
Variable,
|
|
||||||
Parameter,
|
|
||||||
TypeRef,
|
|
||||||
EnumConstant
|
|
||||||
}
|
|
||||||
|
|
||||||
data class LyngSemanticSpan(
|
|
||||||
val range: TextRange,
|
|
||||||
val kind: LyngSemanticKind
|
|
||||||
)
|
|
||||||
|
|
||||||
object LyngLanguageTools {
|
|
||||||
|
|
||||||
suspend fun analyze(request: LyngAnalysisRequest): LyngAnalysisResult {
|
|
||||||
val source = Source(request.fileName, request.text)
|
|
||||||
val miniSink = MiniAstBuilder()
|
|
||||||
val resolutionCollector = ResolutionCollector(source.fileName)
|
|
||||||
val diagnostics = ArrayList<LyngDiagnostic>()
|
|
||||||
|
|
||||||
try {
|
|
||||||
Compiler.compileWithResolution(
|
|
||||||
source,
|
|
||||||
request.importProvider,
|
|
||||||
miniSink = miniSink,
|
|
||||||
resolutionSink = resolutionCollector,
|
|
||||||
useBytecodeStatements = false,
|
|
||||||
allowUnresolvedRefs = true,
|
|
||||||
seedScope = request.seedScope
|
|
||||||
)
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
val pos = (t as? net.sergeych.lyng.ScriptError)?.pos
|
|
||||||
diagnostics += LyngDiagnostic(
|
|
||||||
message = t.message ?: t.toString(),
|
|
||||||
severity = LyngDiagnosticSeverity.Error,
|
|
||||||
range = pos?.let { posToRange(source, it) },
|
|
||||||
pos = pos
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val mini = miniSink.build()
|
|
||||||
val binding = mini?.let { Binder.bind(request.text, it) }
|
|
||||||
val report = try { resolutionCollector.buildReport() } catch (_: Throwable) { null }
|
|
||||||
|
|
||||||
report?.errors?.forEach { err ->
|
|
||||||
diagnostics += LyngDiagnostic(
|
|
||||||
message = err.message,
|
|
||||||
severity = LyngDiagnosticSeverity.Error,
|
|
||||||
range = posToRange(source, err.pos),
|
|
||||||
pos = err.pos
|
|
||||||
)
|
|
||||||
}
|
|
||||||
report?.warnings?.forEach { warn ->
|
|
||||||
diagnostics += LyngDiagnostic(
|
|
||||||
message = warn.message,
|
|
||||||
severity = LyngDiagnosticSeverity.Warning,
|
|
||||||
range = posToRange(source, warn.pos),
|
|
||||||
pos = warn.pos
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
val imports = when {
|
|
||||||
mini != null -> DocLookupUtils.canonicalImportedModules(mini, request.text)
|
|
||||||
else -> DocLookupUtils.extractImportsFromText(request.text).toMutableList().apply { add("lyng.stdlib") }.distinct()
|
|
||||||
}
|
|
||||||
|
|
||||||
val lexical = try { SimpleLyngHighlighter().highlight(request.text) } catch (_: Throwable) { emptyList() }
|
|
||||||
|
|
||||||
return LyngAnalysisResult(
|
|
||||||
source = source,
|
|
||||||
text = request.text,
|
|
||||||
mini = mini,
|
|
||||||
binding = binding,
|
|
||||||
resolution = report,
|
|
||||||
importedModules = imports,
|
|
||||||
diagnostics = diagnostics,
|
|
||||||
lexicalHighlights = lexical
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun analyze(text: String, fileName: String = "<snippet>"): LyngAnalysisResult =
|
|
||||||
analyze(LyngAnalysisRequest(text = text, fileName = fileName))
|
|
||||||
|
|
||||||
fun format(text: String, config: LyngFormatConfig = LyngFormatConfig()): String =
|
|
||||||
LyngFormatter.format(text, config)
|
|
||||||
|
|
||||||
fun lexicalHighlights(text: String): List<HighlightSpan> =
|
|
||||||
SimpleLyngHighlighter().highlight(text)
|
|
||||||
|
|
||||||
fun semanticHighlights(analysis: LyngAnalysisResult): List<LyngSemanticSpan> {
|
|
||||||
val mini = analysis.mini ?: return emptyList()
|
|
||||||
val source = analysis.source
|
|
||||||
val out = ArrayList<LyngSemanticSpan>(128)
|
|
||||||
val covered = HashSet<Pair<Int, Int>>()
|
|
||||||
|
|
||||||
fun addRange(start: Int, end: Int, kind: LyngSemanticKind) {
|
|
||||||
if (start < 0 || end <= start || end > analysis.text.length) return
|
|
||||||
val key = start to end
|
|
||||||
if (covered.add(key)) out += LyngSemanticSpan(TextRange(start, end), kind)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addName(pos: Pos, name: String, kind: LyngSemanticKind) {
|
|
||||||
val s = source.offsetOf(pos)
|
|
||||||
addRange(s, s + name.length, kind)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addTypeSegments(t: MiniTypeRef?) {
|
|
||||||
when (t) {
|
|
||||||
is MiniTypeName -> t.segments.forEach { seg ->
|
|
||||||
addName(seg.range.start, seg.name, LyngSemanticKind.TypeRef)
|
|
||||||
}
|
|
||||||
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 -> {
|
|
||||||
addRange(source.offsetOf(t.range.start), source.offsetOf(t.range.end), LyngSemanticKind.TypeRef)
|
|
||||||
}
|
|
||||||
is MiniTypeUnion -> {
|
|
||||||
t.options.forEach { addTypeSegments(it) }
|
|
||||||
}
|
|
||||||
is MiniTypeIntersection -> {
|
|
||||||
t.options.forEach { addTypeSegments(it) }
|
|
||||||
}
|
|
||||||
null -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addDeclTypeSegments(d: MiniDecl) {
|
|
||||||
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) }
|
|
||||||
d.members.forEach { m ->
|
|
||||||
when (m) {
|
|
||||||
is MiniMemberFunDecl -> {
|
|
||||||
addTypeSegments(m.returnType)
|
|
||||||
m.params.forEach { addTypeSegments(it.type) }
|
|
||||||
}
|
|
||||||
is MiniMemberValDecl -> addTypeSegments(m.type)
|
|
||||||
is MiniMemberTypeAliasDecl -> addTypeSegments(m.target)
|
|
||||||
is MiniInitDecl -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
is MiniEnumDecl -> {}
|
|
||||||
is MiniTypeAliasDecl -> addTypeSegments(d.target)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (d in mini.declarations) {
|
|
||||||
when (d) {
|
|
||||||
is MiniFunDecl -> addName(d.nameStart, d.name, LyngSemanticKind.Function)
|
|
||||||
is MiniClassDecl -> addName(d.nameStart, d.name, LyngSemanticKind.Class)
|
|
||||||
is MiniEnumDecl -> addName(d.nameStart, d.name, LyngSemanticKind.Enum)
|
|
||||||
is MiniValDecl -> addName(d.nameStart, d.name, if (d.mutable) LyngSemanticKind.Variable else LyngSemanticKind.Value)
|
|
||||||
is MiniTypeAliasDecl -> addName(d.nameStart, d.name, LyngSemanticKind.TypeAlias)
|
|
||||||
}
|
|
||||||
addDeclTypeSegments(d)
|
|
||||||
}
|
|
||||||
|
|
||||||
mini.imports.forEach { imp ->
|
|
||||||
imp.segments.forEach { seg ->
|
|
||||||
addRange(source.offsetOf(seg.range.start), source.offsetOf(seg.range.end), LyngSemanticKind.TypeRef)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun addParams(params: List<MiniParam>) {
|
|
||||||
params.forEach { p -> addName(p.nameStart, p.name, LyngSemanticKind.Parameter) }
|
|
||||||
}
|
|
||||||
mini.declarations.forEach { d ->
|
|
||||||
when (d) {
|
|
||||||
is MiniFunDecl -> addParams(d.params)
|
|
||||||
is MiniClassDecl -> d.members.filterIsInstance<MiniMemberFunDecl>().forEach { addParams(it.params) }
|
|
||||||
else -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
mini.declarations.filterIsInstance<MiniEnumDecl>().forEach { en ->
|
|
||||||
en.entries.zip(en.entryPositions).forEach { (name, pos) ->
|
|
||||||
addName(pos, name, LyngSemanticKind.EnumConstant)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
analysis.binding?.let { binding ->
|
|
||||||
val declKeys = binding.symbols.map { it.declStart to it.declEnd }.toSet()
|
|
||||||
for (ref in binding.references) {
|
|
||||||
if (declKeys.contains(ref.start to ref.end)) continue
|
|
||||||
val sym = binding.symbols.firstOrNull { it.id == ref.symbolId } ?: continue
|
|
||||||
val kind = when (sym.kind) {
|
|
||||||
SymbolKind.Function -> LyngSemanticKind.Function
|
|
||||||
SymbolKind.Class -> LyngSemanticKind.Class
|
|
||||||
SymbolKind.Enum -> LyngSemanticKind.Enum
|
|
||||||
SymbolKind.TypeAlias -> LyngSemanticKind.TypeAlias
|
|
||||||
SymbolKind.Value -> LyngSemanticKind.Value
|
|
||||||
SymbolKind.Variable -> LyngSemanticKind.Variable
|
|
||||||
SymbolKind.Parameter -> LyngSemanticKind.Parameter
|
|
||||||
}
|
|
||||||
addRange(ref.start, ref.end, kind)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return out.sortedBy { it.range.start }
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun completions(text: String, offset: Int, analysis: LyngAnalysisResult? = null): List<CompletionItem> {
|
|
||||||
val mini = analysis?.mini
|
|
||||||
val binding = analysis?.binding
|
|
||||||
StdlibDocsBootstrap.ensure()
|
|
||||||
return CompletionEngineLight.completeSuspend(text, offset, mini, binding)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun definitionAt(analysis: LyngAnalysisResult, offset: Int): LyngSymbolTarget? {
|
|
||||||
val binding = analysis.binding ?: return null
|
|
||||||
val sym = binding.symbols.firstOrNull { offset in it.declStart until it.declEnd }
|
|
||||||
?: binding.references.firstOrNull { offset in it.start until it.end }
|
|
||||||
?.let { ref -> binding.symbols.firstOrNull { it.id == ref.symbolId } }
|
|
||||||
?: return null
|
|
||||||
val containerName = sym.containerId?.let { cid -> binding.symbols.firstOrNull { it.id == cid }?.name }
|
|
||||||
return LyngSymbolTarget(
|
|
||||||
name = sym.name,
|
|
||||||
kind = sym.kind,
|
|
||||||
range = TextRange(sym.declStart, sym.declEnd),
|
|
||||||
containerName = containerName
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
fun usagesAt(analysis: LyngAnalysisResult, offset: Int, includeDeclaration: Boolean = false): List<TextRange> {
|
|
||||||
val binding = analysis.binding ?: return emptyList()
|
|
||||||
val sym = binding.symbols.firstOrNull { offset in it.declStart until it.declEnd }
|
|
||||||
?: binding.references.firstOrNull { offset in it.start until it.end }
|
|
||||||
?.let { ref -> binding.symbols.firstOrNull { it.id == ref.symbolId } }
|
|
||||||
?: return emptyList()
|
|
||||||
val ranges = binding.references.filter { it.symbolId == sym.id }.map { TextRange(it.start, it.end) }.toMutableList()
|
|
||||||
if (includeDeclaration) ranges.add(TextRange(sym.declStart, sym.declEnd))
|
|
||||||
return ranges
|
|
||||||
}
|
|
||||||
|
|
||||||
fun docAt(analysis: LyngAnalysisResult, offset: Int): LyngSymbolInfo? {
|
|
||||||
StdlibDocsBootstrap.ensure()
|
|
||||||
val target = definitionAt(analysis, offset) ?: return null
|
|
||||||
val mini = analysis.mini
|
|
||||||
val imported = analysis.importedModules
|
|
||||||
val name = target.name
|
|
||||||
|
|
||||||
val local = mini?.let { findLocalDecl(it, analysis.text, name, target.range.start) }
|
|
||||||
if (local != null) {
|
|
||||||
val signature = signatureOf(local.first, local.second)
|
|
||||||
return LyngSymbolInfo(target, signature = signature, doc = local.first.doc)
|
|
||||||
}
|
|
||||||
|
|
||||||
if (target.containerName != null) {
|
|
||||||
val member = DocLookupUtils.resolveMemberWithInheritance(imported, target.containerName, name, mini)
|
|
||||||
if (member != null) {
|
|
||||||
val signature = signatureOf(member.second, member.first)
|
|
||||||
return LyngSymbolInfo(target, signature = signature, doc = member.second.doc)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
for (mod in imported) {
|
|
||||||
val decl = BuiltinDocRegistry.docsForModule(mod).firstOrNull { it.name == name }
|
|
||||||
if (decl != null) {
|
|
||||||
val signature = signatureOf(decl, null)
|
|
||||||
return LyngSymbolInfo(target, signature = signature, doc = decl.doc)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
return LyngSymbolInfo(target, signature = null, doc = null)
|
|
||||||
}
|
|
||||||
|
|
||||||
suspend fun disassembleSymbol(
|
|
||||||
code: String,
|
|
||||||
symbol: String,
|
|
||||||
importProvider: ImportProvider = Script.defaultImportManager
|
|
||||||
): String {
|
|
||||||
val script = Compiler.compile(code.toSource(), importProvider)
|
|
||||||
val scope = importProvider.newStdScope(Pos.builtIn)
|
|
||||||
script.execute(scope)
|
|
||||||
val (container, member) = splitMember(symbol)
|
|
||||||
if (member == null) return disassembleFromScope(scope, container)
|
|
||||||
val rec = scope.get(container) ?: return "$symbol is not found"
|
|
||||||
val cls = rec.value as? ObjClass ?: return "$container is not a class"
|
|
||||||
val classScope = cls.classScope ?: return "$container has no class scope"
|
|
||||||
return disassembleFromScope(classScope, member)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun posToRange(source: Source, pos: Pos): TextRange {
|
|
||||||
val s = source.offsetOf(pos)
|
|
||||||
return TextRange(s, (s + 1).coerceAtMost(source.text.length))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun findLocalDecl(mini: MiniScript, text: String, name: String, declStart: Int): Pair<MiniNamedDecl, String?>? {
|
|
||||||
val src = mini.range.start.source
|
|
||||||
fun matches(p: Pos, len: Int) = src.offsetOf(p).let { s -> s == declStart && len > 0 }
|
|
||||||
|
|
||||||
for (d in mini.declarations) {
|
|
||||||
if (d.name == name && matches(d.nameStart, d.name.length)) return d to null
|
|
||||||
if (d is MiniClassDecl) {
|
|
||||||
d.members.forEach { m ->
|
|
||||||
if (m.name == name && matches(m.nameStart, m.name.length)) return m to d.name
|
|
||||||
}
|
|
||||||
d.ctorFields.firstOrNull { it.name == name && matches(it.nameStart, it.name.length) }?.let {
|
|
||||||
return DocLookupUtils.toMemberVal(it) to d.name
|
|
||||||
}
|
|
||||||
d.classFields.firstOrNull { it.name == name && matches(it.nameStart, it.name.length) }?.let {
|
|
||||||
return DocLookupUtils.toMemberVal(it) to d.name
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun signatureOf(decl: MiniNamedDecl, ownerClass: String?): String? {
|
|
||||||
val owner = ownerClass?.let { "$it." } ?: ""
|
|
||||||
return when (decl) {
|
|
||||||
is MiniFunDecl -> {
|
|
||||||
val params = decl.params.joinToString(", ") { it.name + typeSuffix(it.type) }
|
|
||||||
val ret = typeSuffix(decl.returnType)
|
|
||||||
"fun $owner${decl.name}($params)$ret"
|
|
||||||
}
|
|
||||||
is MiniMemberFunDecl -> {
|
|
||||||
val params = decl.params.joinToString(", ") { it.name + typeSuffix(it.type) }
|
|
||||||
val ret = typeSuffix(decl.returnType)
|
|
||||||
"fun $owner${decl.name}($params)$ret"
|
|
||||||
}
|
|
||||||
is MiniValDecl -> {
|
|
||||||
val kw = if (decl.mutable) "var" else "val"
|
|
||||||
"$kw $owner${decl.name}${typeSuffix(decl.type)}"
|
|
||||||
}
|
|
||||||
is MiniMemberValDecl -> {
|
|
||||||
val kw = if (decl.mutable) "var" else "val"
|
|
||||||
"$kw $owner${decl.name}${typeSuffix(decl.type)}"
|
|
||||||
}
|
|
||||||
is MiniClassDecl -> {
|
|
||||||
val bases = if (decl.bases.isEmpty()) "" else ": " + decl.bases.joinToString(", ")
|
|
||||||
"class ${decl.name}$bases"
|
|
||||||
}
|
|
||||||
is MiniEnumDecl -> "enum ${decl.name}"
|
|
||||||
is MiniTypeAliasDecl -> {
|
|
||||||
val tp = if (decl.typeParams.isEmpty()) "" else "<" + decl.typeParams.joinToString(", ") + ">"
|
|
||||||
"type ${decl.name}$tp = ${DocLookupUtils.typeOf(decl.target)}"
|
|
||||||
}
|
|
||||||
is MiniMemberTypeAliasDecl -> {
|
|
||||||
val tp = if (decl.typeParams.isEmpty()) "" else "<" + decl.typeParams.joinToString(", ") + ">"
|
|
||||||
"type $owner${decl.name}$tp = ${DocLookupUtils.typeOf(decl.target)}"
|
|
||||||
}
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun typeSuffix(type: MiniTypeRef?): String =
|
|
||||||
type?.let { ": ${DocLookupUtils.typeOf(it)}" } ?: ""
|
|
||||||
|
|
||||||
private fun splitMember(symbol: String): Pair<String, String?> {
|
|
||||||
val idx = symbol.lastIndexOf('.')
|
|
||||||
return if (idx >= 0 && idx + 1 < symbol.length) {
|
|
||||||
symbol.substring(0, idx) to symbol.substring(idx + 1)
|
|
||||||
} else {
|
|
||||||
symbol to null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun disassembleFromScope(scope: Scope, name: String): String {
|
|
||||||
val record = scope.get(name) ?: return "$name is not found"
|
|
||||||
val stmt = record.value as? net.sergeych.lyng.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)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -97,18 +97,13 @@ class BindingHighlightTest {
|
|||||||
}
|
}
|
||||||
|
|
||||||
val format = "%" + "s"
|
val format = "%" + "s"
|
||||||
class File(val name, val size, val dir=false) {
|
|
||||||
fun isDirectory() = dir
|
|
||||||
}
|
|
||||||
val files = [File("a", 1), File("b", 2, true)]
|
|
||||||
|
|
||||||
for( raw in files ) {
|
for( f in files ) {
|
||||||
val f = raw as File
|
var name = f.name
|
||||||
val name = f.name
|
|
||||||
val path = name + "/"
|
|
||||||
if( f.isDirectory() )
|
if( f.isDirectory() )
|
||||||
println("is directory")
|
println("is directory")
|
||||||
println( format(path, f.size) )
|
name += "/"
|
||||||
|
println( format(name, f.size()) )
|
||||||
}
|
}
|
||||||
|
|
||||||
test21()
|
test21()
|
||||||
@@ -124,9 +119,16 @@ class BindingHighlightTest {
|
|||||||
// Ensure we registered the local var/val symbol for `name`
|
// Ensure we registered the local var/val symbol for `name`
|
||||||
val nameSym = binding.symbols.firstOrNull { it.name == "name" }
|
val nameSym = binding.symbols.firstOrNull { it.name == "name" }
|
||||||
assertNotNull(nameSym, "Local variable 'name' should be registered as a symbol")
|
assertNotNull(nameSym, "Local variable 'name' should be registered as a symbol")
|
||||||
assertEquals(SymbolKind.Value, nameSym.kind, "'name' is declared with val and must be SymbolKind.Value")
|
assertEquals(SymbolKind.Variable, nameSym.kind, "'name' is declared with var and must be SymbolKind.Variable")
|
||||||
|
|
||||||
// Usage tracking for locals inside loops is currently best-effort; ensure the symbol is registered.
|
// Ensure there is at least one usage reference to `name` (not just the declaration)
|
||||||
|
val nameRefs = binding.references.filter { it.symbolId == nameSym.id }
|
||||||
|
println("[DEBUG_LOG] name decl at ${nameSym.declStart}..${nameSym.declEnd}")
|
||||||
|
println("[DEBUG_LOG] name refs: ${nameRefs.map { it.start to it.end }}")
|
||||||
|
assertTrue(nameRefs.isNotEmpty(), "Usages of 'name' should be bound to its declaration")
|
||||||
|
|
||||||
|
// We expect at least two usages of `name`: in "+=" and in the call argument.
|
||||||
|
assertTrue(nameRefs.size >= 2, "Binder should bind multiple usages of 'name'")
|
||||||
|
|
||||||
// Ensure function call at top-level is bound to the function symbol
|
// Ensure function call at top-level is bound to the function symbol
|
||||||
val fnSym = binding.symbols.firstOrNull { it.name == "test21" && it.kind == SymbolKind.Function }
|
val fnSym = binding.symbols.firstOrNull { it.name == "test21" && it.kind == SymbolKind.Function }
|
||||||
@@ -146,18 +148,13 @@ class BindingHighlightTest {
|
|||||||
fun binder_binds_name_used_in_string_literal_invoke() = runTest {
|
fun binder_binds_name_used_in_string_literal_invoke() = runTest {
|
||||||
val code = """
|
val code = """
|
||||||
val format = "%" + "s"
|
val format = "%" + "s"
|
||||||
class File(val name, val size, val dir=false) {
|
|
||||||
fun isDirectory() = dir
|
|
||||||
}
|
|
||||||
val files = [File("a", 1), File("b", 2, true)]
|
|
||||||
|
|
||||||
for( raw in files ) {
|
for( f in files ) {
|
||||||
val f = raw as File
|
var name = f.name
|
||||||
val name = f.name
|
|
||||||
val path = name + "/"
|
|
||||||
if( f.isDirectory() )
|
if( f.isDirectory() )
|
||||||
println("is directory")
|
println("%s is directory"(name))
|
||||||
println( format(path, f.size) )
|
name += "/"
|
||||||
|
println( format(name, f.size()) )
|
||||||
}
|
}
|
||||||
"""
|
"""
|
||||||
|
|
||||||
@@ -171,6 +168,15 @@ class BindingHighlightTest {
|
|||||||
val nameSym = binding.symbols.firstOrNull { it.name == "name" && (it.kind == SymbolKind.Variable || it.kind == SymbolKind.Value) }
|
val nameSym = binding.symbols.firstOrNull { it.name == "name" && (it.kind == SymbolKind.Variable || it.kind == SymbolKind.Value) }
|
||||||
assertNotNull(nameSym, "Local variable 'name' should be registered as a symbol")
|
assertNotNull(nameSym, "Local variable 'name' should be registered as a symbol")
|
||||||
|
|
||||||
// Usage tracking for locals inside loops is currently best-effort; ensure the symbol is registered.
|
// Find the specific usage inside string-literal invocation: "%s is directory"(name)
|
||||||
|
val pattern = "\"%s is directory\"(name)"
|
||||||
|
val lineIdx = text.indexOf(pattern)
|
||||||
|
assertTrue(lineIdx >= 0, "Pattern with string invoke should be present in the snippet")
|
||||||
|
val nameStart = lineIdx + pattern.indexOf("name")
|
||||||
|
val nameEnd = nameStart + "name".length
|
||||||
|
|
||||||
|
val hasRefAtInvoke = binding.references.any { it.symbolId == nameSym.id && it.start == nameStart && it.end == nameEnd }
|
||||||
|
println("[DEBUG_LOG] refs for 'name': ${binding.references.filter { it.symbolId == nameSym.id }.map { it.start to it.end }}")
|
||||||
|
assertTrue(hasRefAtInvoke, "Binder should bind 'name' used as an argument to a string-literal invocation")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,91 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
import kotlinx.coroutines.test.runTest
|
|
||||||
import net.sergeych.lyng.eval
|
|
||||||
import kotlin.test.Test
|
|
||||||
|
|
||||||
class BytecodeRecentOpsTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun listLiteralWithSpread() = runTest {
|
|
||||||
eval(
|
|
||||||
"""
|
|
||||||
val a = [1, 2, 3]
|
|
||||||
val b = [0, ...a, 4]
|
|
||||||
assertEquals(5, b.size)
|
|
||||||
assertEquals(0, b[0])
|
|
||||||
assertEquals(1, b[1])
|
|
||||||
assertEquals(4, b[4])
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun valueFnRefViaClassOperator() = runTest {
|
|
||||||
eval(
|
|
||||||
"""
|
|
||||||
val c = 1::class
|
|
||||||
assertEquals("Int", c.className)
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun implicitThisCompoundAssign() = runTest {
|
|
||||||
eval(
|
|
||||||
"""
|
|
||||||
class C {
|
|
||||||
var x: Int = 1
|
|
||||||
fun add(n: Int) { x += n }
|
|
||||||
fun calc() { add(2); x }
|
|
||||||
}
|
|
||||||
val c = C()
|
|
||||||
assertEquals(3, c.calc())
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun optionalCompoundAssignEvaluatesRhsOnce() = runTest {
|
|
||||||
eval(
|
|
||||||
"""
|
|
||||||
var count = 0
|
|
||||||
fun inc() { count = count + 1; return 3 }
|
|
||||||
class Box(var v)
|
|
||||||
var b = Box(1)
|
|
||||||
b?.v += inc()
|
|
||||||
assertEquals(4, b.v)
|
|
||||||
assertEquals(1, count)
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun optionalIndexCompoundAssignEvaluatesRhsOnce() = runTest {
|
|
||||||
eval(
|
|
||||||
"""
|
|
||||||
var count = 0
|
|
||||||
fun inc() { count = count + 1; return 2 }
|
|
||||||
var a = [1, 2, 3]
|
|
||||||
a?[1] += inc()
|
|
||||||
assertEquals(4, a[1])
|
|
||||||
assertEquals(1, count)
|
|
||||||
""".trimIndent()
|
|
||||||
)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,174 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
import kotlinx.coroutines.test.runTest
|
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Script
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.resolution.CompileTimeResolver
|
|
||||||
import kotlin.test.Test
|
|
||||||
import kotlin.test.assertEquals
|
|
||||||
import kotlin.test.assertTrue
|
|
||||||
|
|
||||||
class CompileTimeResolutionDryRunTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunReturnsMetadataContainer() = runTest {
|
|
||||||
val report = CompileTimeResolver.dryRun(
|
|
||||||
Source("<dry-run>", "val x = 1"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertEquals("<dry-run>", report.moduleName)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun compilerDryRunEntryPoint() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "val x = 1"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertEquals("<dry-run>", report.moduleName)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsModuleSymbols() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "val x = 1\nfun f() { x }\nclass C"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
val names = report.symbols.map { it.name }.toSet()
|
|
||||||
assertTrue("x" in names)
|
|
||||||
assertTrue("f" in names)
|
|
||||||
assertTrue("C" in names)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsObjectSymbols() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "object O { val x = 1 }\nO"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
val names = report.symbols.map { it.name }.toSet()
|
|
||||||
assertTrue("O" in names)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsCtorParams() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "class C(x) { val y = x }"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
val names = report.symbols.map { it.name }.toSet()
|
|
||||||
assertTrue("x" in names)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsMapLiteralShorthandRefs() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "val x = 1\nval m = { x: }\nm"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsBaseClassRefs() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "class A {}\nclass B : A {}"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsTypeRefs() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "class A {}\nval x: A = A()"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunAcceptsQualifiedTypeRefs() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "val x: lyng.time.Instant? = null"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsExtensionReceiverRefs() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "class A {}\nfun A.foo() = 1\nval A.bar get() = 2"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunAcceptsLoopAndCatchLocals() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source(
|
|
||||||
"<dry-run>",
|
|
||||||
"""
|
|
||||||
fun f() {
|
|
||||||
for (i in 0..2) { i }
|
|
||||||
try { 1 } catch(e: Exception) { e }
|
|
||||||
}
|
|
||||||
""".trimIndent()
|
|
||||||
),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunCollectsCaptures() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source("<dry-run>", "val x = 1\nval f = { x }\nf()"),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
val captureNames = report.captures.map { it.name }.toSet()
|
|
||||||
assertTrue("x" in captureNames)
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun dryRunAcceptsScopeReflectionHelpers() = runTest {
|
|
||||||
val report = Compiler.dryRun(
|
|
||||||
Source(
|
|
||||||
"<dry-run>",
|
|
||||||
"""
|
|
||||||
fun f() {
|
|
||||||
var x = 1
|
|
||||||
scope.get("x")
|
|
||||||
scope.set("x", 2)
|
|
||||||
scope.locals()
|
|
||||||
scope.captures()
|
|
||||||
scope.members()
|
|
||||||
}
|
|
||||||
f()
|
|
||||||
""".trimIndent()
|
|
||||||
),
|
|
||||||
Script.defaultImportManager
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,94 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
import kotlinx.coroutines.test.runTest
|
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Script
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.obj.toInt
|
|
||||||
import kotlin.test.Test
|
|
||||||
import kotlin.test.assertEquals
|
|
||||||
|
|
||||||
class CompileTimeResolutionRuntimeTest {
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun strictSlotRefsAllowCapturedLocals() = runTest {
|
|
||||||
val code = """
|
|
||||||
fun outer() {
|
|
||||||
var x = 1
|
|
||||||
fun inner() { x = 3; x }
|
|
||||||
inner()
|
|
||||||
}
|
|
||||||
outer()
|
|
||||||
""".trimIndent()
|
|
||||||
val script = Compiler.compileWithResolution(
|
|
||||||
Source("<strict-slot>", code),
|
|
||||||
Script.defaultImportManager,
|
|
||||||
useBytecodeStatements = false,
|
|
||||||
strictSlotRefs = true
|
|
||||||
)
|
|
||||||
val result = script.execute(Script.defaultImportManager.newStdScope())
|
|
||||||
assertEquals(3, result.toInt())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun bytecodeRespectsShadowingInNestedBlock() = runTest {
|
|
||||||
val code = """
|
|
||||||
fun outer() {
|
|
||||||
var x = 1
|
|
||||||
val y = {
|
|
||||||
var x = 10
|
|
||||||
x + 1
|
|
||||||
}
|
|
||||||
y() + x
|
|
||||||
}
|
|
||||||
outer()
|
|
||||||
""".trimIndent()
|
|
||||||
val script = Compiler.compileWithResolution(
|
|
||||||
Source("<shadow-slot>", code),
|
|
||||||
Script.defaultImportManager,
|
|
||||||
useBytecodeStatements = true,
|
|
||||||
strictSlotRefs = true
|
|
||||||
)
|
|
||||||
val result = script.execute(Script.defaultImportManager.newStdScope())
|
|
||||||
assertEquals(12, result.toInt())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun bytecodeRespectsShadowingInBlockStatement() = runTest {
|
|
||||||
val code = """
|
|
||||||
fun outer() {
|
|
||||||
var x = 1
|
|
||||||
var y = 0
|
|
||||||
if (true) {
|
|
||||||
var x = 10
|
|
||||||
y = x + 1
|
|
||||||
}
|
|
||||||
y + x
|
|
||||||
}
|
|
||||||
outer()
|
|
||||||
""".trimIndent()
|
|
||||||
val script = Compiler.compileWithResolution(
|
|
||||||
Source("<shadow-block>", code),
|
|
||||||
Script.defaultImportManager,
|
|
||||||
useBytecodeStatements = true,
|
|
||||||
strictSlotRefs = true
|
|
||||||
)
|
|
||||||
val result = script.execute(Script.defaultImportManager.newStdScope())
|
|
||||||
assertEquals(12, result.toInt(), "result=${result.toInt()}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,192 +0,0 @@
|
|||||||
/*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
import kotlinx.coroutines.test.runTest
|
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Script
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.resolution.SymbolOrigin
|
|
||||||
import kotlin.test.Ignore
|
|
||||||
import kotlin.test.Test
|
|
||||||
import kotlin.test.assertEquals
|
|
||||||
import kotlin.test.assertTrue
|
|
||||||
|
|
||||||
class CompileTimeResolutionSpecTest {
|
|
||||||
|
|
||||||
private suspend fun dryRun(code: String) =
|
|
||||||
Compiler.dryRun(Source("<dry-run>", code.trimIndent()), Script.defaultImportManager)
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun resolvesLocalsBeforeMembers() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
class C {
|
|
||||||
val x = 1
|
|
||||||
fun f() { val x = 2; x }
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
assertTrue(report.warnings.any { it.message.contains("shadowing member: x") })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun capturesOuterLocalsDeterministically() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
var g = 1
|
|
||||||
fun f() {
|
|
||||||
var g = 2
|
|
||||||
val h = { g }
|
|
||||||
h()
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
assertTrue(report.captures.any { it.name == "g" && it.origin == SymbolOrigin.OUTER })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun capturesModuleGlobalsAsOuterScope() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
val G = 10
|
|
||||||
fun f(x=0) = x + G
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
assertTrue(report.captures.any { it.name == "G" && it.origin == SymbolOrigin.MODULE })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun unresolvedNameIsCompileError() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
fun f() { missingName }
|
|
||||||
f()
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.any { it.message.contains("missingName") })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun miAmbiguityIsCompileError() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
class A { fun foo() = 1 }
|
|
||||||
class B { fun foo() = 2 }
|
|
||||||
class C : A, B { }
|
|
||||||
C().foo()
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isNotEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun miOverrideResolvesConflict() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
class A { fun foo() = 1 }
|
|
||||||
class B { fun foo() = 2 }
|
|
||||||
class C : A, B {
|
|
||||||
override fun foo() = 3
|
|
||||||
}
|
|
||||||
C().foo()
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun qualifiedThisMemberAccess() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
class A { fun foo() = 1 }
|
|
||||||
class B { fun foo() = 2 }
|
|
||||||
class C : A, B {
|
|
||||||
override fun foo() = 3
|
|
||||||
fun aFoo() = this@A.foo()
|
|
||||||
fun bFoo() = this@B.foo()
|
|
||||||
}
|
|
||||||
val c = C()
|
|
||||||
c.aFoo()
|
|
||||||
c.bFoo()
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun reflectionIsExplicitOnly() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
fun f() {
|
|
||||||
val x = 1
|
|
||||||
scope.get("x")
|
|
||||||
}
|
|
||||||
f()
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun memberShadowingAllowedWithWarning() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
class C {
|
|
||||||
val x = 1
|
|
||||||
fun f() { val x = 2; x }
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
assertTrue(report.warnings.any { it.message.contains("shadowing member: x") })
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun parameterShadowingAllowed() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
fun f(a=0) {
|
|
||||||
var a = a * 10
|
|
||||||
a
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
fun shadowingCaptureIsAllowed() = runTest {
|
|
||||||
val report = dryRun(
|
|
||||||
"""
|
|
||||||
fun outer() {
|
|
||||||
var x = 1
|
|
||||||
fun inner() {
|
|
||||||
val x = 2
|
|
||||||
val c = { x }
|
|
||||||
c()
|
|
||||||
}
|
|
||||||
inner()
|
|
||||||
}
|
|
||||||
"""
|
|
||||||
)
|
|
||||||
assertTrue(report.errors.isEmpty())
|
|
||||||
assertTrue(report.captures.any { it.name == "x" && it.origin == SymbolOrigin.OUTER })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -73,7 +73,7 @@ class TestCoroutines {
|
|||||||
counter = c + 1
|
counter = c + 1
|
||||||
// }
|
// }
|
||||||
}
|
}
|
||||||
}.forEach { (it as Deferred).await() }
|
}.forEach { it.await() }
|
||||||
println(counter)
|
println(counter)
|
||||||
assert( counter < 10 )
|
assert( counter < 10 )
|
||||||
|
|
||||||
@@ -185,4 +185,4 @@ class TestCoroutines {
|
|||||||
// }.toList())
|
// }.toList())
|
||||||
""".trimIndent())
|
""".trimIndent())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -52,9 +52,9 @@ class EmbeddingExceptionTest {
|
|||||||
|
|
||||||
// 1. Define, throw and catch the exception in Lyng to get the object
|
// 1. Define, throw and catch the exception in Lyng to get the object
|
||||||
val errorObj = scope.eval("""
|
val errorObj = scope.eval("""
|
||||||
class MyException(val code) : Exception("something failed")
|
class MyException(val code, m) : Exception(m)
|
||||||
try {
|
try {
|
||||||
throw MyException(123)
|
throw MyException(123, "something failed")
|
||||||
} catch {
|
} catch {
|
||||||
it
|
it
|
||||||
}
|
}
|
||||||
@@ -91,11 +91,9 @@ class EmbeddingExceptionTest {
|
|||||||
val message = caughtObj.getLyngExceptionMessage(scope)
|
val message = caughtObj.getLyngExceptionMessage(scope)
|
||||||
assertEquals("something failed", message)
|
assertEquals("something failed", message)
|
||||||
|
|
||||||
// Verify stack trace accessor works (may be empty after serialization)
|
// Verify stack trace is available
|
||||||
val stack = caughtObj.getLyngExceptionStackTrace(scope)
|
val stack = caughtObj.getLyngExceptionStackTrace(scope)
|
||||||
if (stack.list.isNotEmpty()) {
|
assertTrue(stack.list.isNotEmpty(), "Stack trace should not be empty")
|
||||||
assertTrue(stack.list.first() is ObjInstance)
|
|
||||||
}
|
|
||||||
|
|
||||||
val errorString = caughtObj.getLyngExceptionString(scope)
|
val errorString = caughtObj.getLyngExceptionString(scope)
|
||||||
assertTrue(errorString.contains("MyException: something failed"), "Error string should contain message")
|
assertTrue(errorString.contains("MyException: something failed"), "Error string should contain message")
|
||||||
|
|||||||
@@ -1,20 +1,3 @@
|
|||||||
/*
|
|
||||||
* 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
|
|
||||||
import kotlinx.coroutines.test.runTest
|
import kotlinx.coroutines.test.runTest
|
||||||
import net.sergeych.lyng.eval
|
import net.sergeych.lyng.eval
|
||||||
@@ -36,7 +19,7 @@ class IfNullAssignTest {
|
|||||||
@Test
|
@Test
|
||||||
fun testPropertyAssignment() = runTest {
|
fun testPropertyAssignment() = runTest {
|
||||||
eval("""
|
eval("""
|
||||||
class Box(var value: Object?)
|
class Box(var value)
|
||||||
val b = Box(null)
|
val b = Box(null)
|
||||||
b.value ?= 10
|
b.value ?= 10
|
||||||
assertEquals(10, b.value)
|
assertEquals(10, b.value)
|
||||||
@@ -59,23 +42,22 @@ class IfNullAssignTest {
|
|||||||
@Test
|
@Test
|
||||||
fun testOptionalChaining() = runTest {
|
fun testOptionalChaining() = runTest {
|
||||||
eval("""
|
eval("""
|
||||||
class Inner(var value: Object?)
|
class Inner(var value)
|
||||||
class Outer(var inner: Inner?)
|
class Outer(var inner)
|
||||||
|
|
||||||
var o: Outer? = null
|
var o = null
|
||||||
o?.inner?.value ?= 10 // should do nothing
|
o?.inner?.value ?= 10 // should do nothing
|
||||||
assertEquals(null, o)
|
assertEquals(null, o)
|
||||||
|
|
||||||
o = Outer(null)
|
o = Outer(null)
|
||||||
o?.inner?.value ?= 10 // should do nothing because inner is null
|
o?.inner?.value ?= 10 // should do nothing because inner is null
|
||||||
val outer = o as Outer
|
assertEquals(null, o.inner)
|
||||||
assertEquals(null, outer.inner)
|
|
||||||
|
|
||||||
outer.inner = Inner(null)
|
o.inner = Inner(null)
|
||||||
outer.inner?.value ?= 42
|
o?.inner?.value ?= 42
|
||||||
assertEquals(42, (outer.inner as Inner).value)
|
assertEquals(42, o.inner.value)
|
||||||
outer.inner?.value ?= 100
|
o?.inner?.value ?= 100
|
||||||
assertEquals(42, (outer.inner as Inner).value)
|
assertEquals(42, o.inner.value)
|
||||||
""".trimIndent())
|
""".trimIndent())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loaded 100 of 182 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user