Compare commits
269
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
2d4ae0d98b | ||
|
|
74d911e837 | ||
|
|
2e7c28f735 | ||
|
|
69156893d4 | ||
|
|
df19524177 | ||
|
|
b6851b7098 | ||
|
|
afa4b20070 | ||
|
|
c5b8871c3a | ||
|
|
7f2f99524f | ||
|
|
bfa8a59df3 | ||
|
|
09b1eb68ae | ||
|
|
fdb23b3a76 | ||
|
|
7c28296f92 | ||
|
|
3e654ddd60 | ||
|
|
e8f5c9eaf4 | ||
|
|
44f9573eec | ||
|
|
a8f6aa31f1 | ||
|
|
fd2da1efd3 | ||
|
|
637258581d | ||
|
|
db9dc73da8 | ||
|
|
b233d4c15f | ||
|
|
3f2c38c471 | ||
|
|
d8d2eff436 | ||
|
|
6295cea6ad | ||
|
|
cc681c76a0 | ||
|
|
9cf87d1075 | ||
|
|
cd145f6a96 | ||
|
|
34678068ac | ||
|
|
e73fe0d3c5 | ||
|
|
26564438e2 | ||
|
|
489dae6604 | ||
|
|
05cba5b653 | ||
|
|
70ba424ef9 | ||
|
|
90826b519d | ||
|
|
4cd8e5ded2 | ||
|
|
db4f7d0973 | ||
|
|
a481371349 | ||
|
|
51319fa8b7 | ||
|
|
86ac7eee54 | ||
|
|
18278794d6 | ||
|
|
ac680ceb6c | ||
|
|
6efdfc1964 | ||
|
|
b9af80a1b2 | ||
|
|
bde32ca7b5 | ||
|
|
99ca15d20f | ||
|
|
c14c7d43d9 | ||
|
|
1271f347bd | ||
|
|
4e08339756 | ||
|
|
b32a937636 | ||
|
|
4db0a7fbab | ||
|
|
8b196c7b0c | ||
|
|
54ca886753 | ||
|
|
abbebec153 | ||
|
|
c066dc7150 | ||
|
|
6c0b86f6e6 | ||
|
|
8f1c660f4e | ||
|
|
3ce9029162 | ||
|
|
0caa9849cf | ||
|
|
8314127fdb | ||
|
|
dab0b9f165 | ||
|
|
6aa23e8ef3 | ||
|
|
c035b4c34c | ||
|
|
9d508e219f | ||
|
|
b49f291bff | ||
|
|
ae88898f58 | ||
|
|
565dbf98ed | ||
|
|
5305ced89f | ||
|
|
b2d5897aa8 | ||
|
|
0b94b46d40 | ||
|
|
541738646f | ||
|
|
f0dc0d2396 | ||
|
|
7850d5fbde | ||
|
|
cde7cf2caf | ||
|
|
473a5dd6ed | ||
|
|
694d15c69d | ||
|
|
780227a229 | ||
|
|
8a7582891a | ||
|
|
5b1a8af4e3 | ||
|
|
58581d6bf0 | ||
|
|
e2f503744d | ||
|
|
d739833c57 | ||
|
|
5fd322a43e | ||
|
|
3a46e59ec8 | ||
|
|
026b023892 | ||
|
|
f9fe3d1186 | ||
|
|
f5ced02505 | ||
|
|
7ea67d4816 | ||
|
|
7b70a37e90 | ||
|
|
a557d0cc59 | ||
|
|
40a55f298e | ||
|
|
b857686d7d | ||
|
|
eb58720365 | ||
|
|
3391da595f | ||
|
|
62975ff511 | ||
|
|
b5bb68d042 | ||
|
|
c16c0d7ebd | ||
|
|
78d8e546d5 | ||
|
|
79bece94a5 | ||
|
|
3b290116b8 | ||
|
|
c35efdc2ae | ||
|
|
d82a9bb930 | ||
|
|
7a286f2e06 | ||
|
|
de9ac14e33 | ||
|
|
40de53f688 | ||
|
|
c31343a040 | ||
|
|
9db5b12c31 | ||
|
|
7e538ed8aa | ||
|
|
566ddc6bde | ||
|
|
afbd6e45b9 | ||
|
|
6220e982a0 | ||
|
|
43a6a7aaf4 | ||
|
|
308a9c0bcb | ||
|
|
24c4ed85b4 | ||
|
|
1fab2702dd | ||
|
|
47654aee38 | ||
|
|
862486e0e8 | ||
|
|
ce0393b309 | ||
|
|
0f1748e053 | ||
|
|
6539b9deff | ||
|
|
ac2a734998 | ||
|
|
ec64d7309c | ||
|
|
874f8fc205 | ||
|
|
54c6fca0e8 | ||
|
|
c5bf4e5039 | ||
|
|
c9da0b256f | ||
|
|
51b397686d | ||
|
|
be337144eb | ||
|
|
824a58bbc5 | ||
|
|
523b9d338b | ||
|
|
8f60a84e3b | ||
|
|
d363501081 | ||
|
|
ffb22d0875 | ||
|
|
2e9e0921bf | ||
|
|
f9c29e742a | ||
|
|
348052991c | ||
|
|
0331ea22f7 | ||
|
|
f6b6395424 | ||
|
|
2622fde41b | ||
|
|
55470795f0 | ||
|
|
eb6facd58d | ||
|
|
7c60f02868 | ||
|
|
eb869dc112 | ||
|
|
c5dbf6ad51 | ||
|
|
55b2162fa3 | ||
|
|
a29acb6000 | ||
|
|
cf3ca342f4 | ||
|
|
431faa9262 | ||
|
|
29aa490748 | ||
|
|
84554ab7c6 | ||
|
|
64fa305aa7 | ||
|
|
eaa5713eaf | ||
|
|
615dc026f7 | ||
|
|
4b66454bf3 | ||
|
|
d6e1e74b48 | ||
|
|
3210205061 | ||
|
|
4c966eb63e | ||
|
|
68122df6d7 | ||
|
|
ecf64dcbc3 | ||
|
|
89cf2c1612 | ||
|
|
9319add9c0 | ||
|
|
a266df6035 | ||
|
|
df48a06311 | ||
|
|
9bc59f4787 | ||
|
|
e16f054010 | ||
|
|
72a060d42f | ||
|
|
bca5912942 | ||
|
|
b5f20e1650 | ||
|
|
40b6ec023c | ||
|
|
e2d359f7a7 | ||
|
|
e4d0730b04 | ||
|
|
20b8464591 | ||
|
|
d8e18e4a0c | ||
|
|
e346e7e56e | ||
|
|
0e069382a2 | ||
|
|
ac8277d374 | ||
|
|
e143f31f3d | ||
|
|
91624a30b8 | ||
|
|
55e06f04b2 | ||
|
|
a8f9ddb60c | ||
|
|
7f7cf0d904 | ||
|
|
104fd6b517 | ||
|
|
6c36314ed8 | ||
|
|
8cec5cf7ec | ||
|
|
6a0f6b3db5 | ||
|
|
079bdb44a6 | ||
|
|
238c2177b6 | ||
|
|
212a3a5b3f | ||
|
|
a73c118c77 | ||
|
|
eaee738dee | ||
|
|
8407dbe880 | ||
|
|
79de950fcc | ||
|
|
c7e2455340 | ||
|
|
f788f79d4b | ||
|
|
f2b99fe23b | ||
|
|
e2a8de97f5 | ||
|
|
70d05f7987 | ||
|
|
54d882ce89 | ||
|
|
3250e5e556 | ||
|
|
1eb8793e35 | ||
|
|
5d5453d994 | ||
|
|
297810154f | ||
|
|
f22efaab19 | ||
|
|
b9d3af56bb | ||
|
|
ac5d1fa65a | ||
|
|
2c2468b672 | ||
|
|
938503fdd4 | ||
|
|
81d86f4c3a | ||
|
|
a4fc5ac6d5 | ||
|
|
aebe0890d8 | ||
|
|
951ce989a6 | ||
|
|
9a15470cdb | ||
|
|
490faea2ba | ||
|
|
250220a42f | ||
|
|
63bcb91504 | ||
|
|
7b3d92beb9 | ||
|
|
8dfdbaa0a0 | ||
|
|
37a8831fd7 | ||
|
|
2311cfc224 | ||
|
|
bef94d3bc5 | ||
|
|
7de856fc62 | ||
|
|
2f4462858b | ||
|
|
144082733c | ||
|
|
72901d9d4c | ||
|
|
059e366787 | ||
|
|
b4598bff98 | ||
|
|
fd1548c86c | ||
|
|
9c56cf751b | ||
|
|
8ae6eb8d69 | ||
|
|
3d9170d677 | ||
|
|
c8a8b12dfc | ||
|
|
6560457e3d | ||
|
|
ea877748e5 | ||
|
|
d8b00a805c | ||
|
|
f42ea0a04c | ||
|
|
bc9e557814 | ||
|
|
b674ee7c18 | ||
|
|
a4f41f17bf | ||
|
|
96947aac50 | ||
|
|
98d6ffe998 | ||
|
|
74d73540c6 | ||
|
|
9b580bafb6 | ||
|
|
062f9e7866 | ||
|
|
717a79aca2 | ||
|
|
7b1ba71ef0 | ||
|
|
8b94432f66 | ||
|
|
338dc00573 | ||
|
|
d0230c5b89 | ||
|
|
5dc2159024 | ||
|
|
0759346e4b | ||
|
|
f848d79d39 | ||
|
|
52a3a96e3f | ||
|
|
b7dfda2f5d | ||
|
|
05e15e8e42 | ||
|
|
d4bb186f85 | ||
|
|
7bc17037f9 | ||
|
|
75723adbbc | ||
|
|
b7fe04d65f | ||
|
|
ec28b219f3 | ||
|
|
6fa57c8197 | ||
|
|
2d2a74656c | ||
|
|
80933c287d | ||
|
|
017111827d | ||
|
|
d2632cb99e | ||
|
|
474293cfe3 | ||
|
|
9924d02cb4 | ||
|
|
1efa96a990 | ||
|
|
f6deabaa38 | ||
|
|
8f04b25fcb | ||
|
|
6b957ae6a3 |
No files matched your search
@@ -0,0 +1,11 @@
|
|||||||
|
# Lyng Project Guidelines
|
||||||
|
|
||||||
|
This project uses the Lyng scripting language for multiplatform scripting.
|
||||||
|
|
||||||
|
## Coding in Lyng
|
||||||
|
When writing, refactoring, or analyzing Lyng code:
|
||||||
|
- **Reference**: Always use `LYNG_AI_SPEC.md` in the project root as the primary source of truth for syntax and idioms.
|
||||||
|
- **File Extensions**: Use `.lyng` for all script files.
|
||||||
|
- **Implicit Coroutines**: Remember that all Lyng functions are implicitly coroutines; do not look for `async/await`.
|
||||||
|
- **Everything is an Expression**: Leverage the fact that blocks, if-statements, and loops return values.
|
||||||
|
- **Maps vs Blocks**: Be careful: `{}` is a block/lambda, use `Map()` for an empty map.
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
# AI Agent Notes
|
||||||
|
|
||||||
|
## Kotlin/Wasm generation guardrails
|
||||||
|
- Avoid creating suspend lambdas for compiler runtime statements. Prefer explicit `object : Statement()` with `override suspend fun execute(...)`.
|
||||||
|
- Do not use `statement { ... }` or other inline suspend lambdas in compiler hot paths (e.g., parsing/var declarations, initializer thunks).
|
||||||
|
- If you need a wrapper for delegated properties, check for `getValue` explicitly and return a concrete `Statement` object when missing; avoid `onNotFoundResult` lambdas.
|
||||||
|
- If wasmJs browser tests hang, first run `:lynglib:wasmJsNodeTest` and look for wasm compilation errors; hangs usually mean module instantiation failed.
|
||||||
|
- Do not increase test timeouts to mask wasm generation errors; fix the invalid IR instead.
|
||||||
|
|
||||||
|
## Type inference notes (notes/new_lyng_type_system_spec.md)
|
||||||
|
- Nullability is Kotlin-style: `T` non-null, `T?` nullable, `!!` asserts non-null.
|
||||||
|
- `void` is a singleton of class `Void` (syntax sugar for return type).
|
||||||
|
- Object members are always allowed even on unknown types; non-Object members require explicit casts. Remove `inspect` from Object and use `toInspectString()` instead.
|
||||||
|
- Type expression checks: `x is T` is value instance check; `T1 is T2` is type-subset; `A in T` means `A` is subset of `T`; `==` is structural type equality.
|
||||||
|
- Type aliases: `type Name = TypeExpr` (generic allowed) expand to their underlying type expressions; no nominal distinctness.
|
||||||
|
- Do not reintroduce bytecode fallback opcodes (e.g., `GET_NAME`, `EVAL_*`, `CALL_FALLBACK`) or runtime name-resolution fallbacks; all symbol resolution must stay compile-time only.
|
||||||
|
|
||||||
|
## Bytecode frame-first migration plan
|
||||||
|
- Treat frame slots as the only storage for locals/temps by default; avoid pre-creating scope slot mappings for compiled functions.
|
||||||
|
- Create closure references only when a capture is detected; use a direct frame+slot reference (foreign slot ref) instead of scope slots.
|
||||||
|
- Keep Scope as a lazy reflection facade: resolve name -> slot only on demand for Kotlin interop (no eager name mapping on every call).
|
||||||
|
- Avoid PUSH_SCOPE/POP_SCOPE in bytecode for loops/functions unless dynamic name access or Kotlin reflection is requested.
|
||||||
+39
-13
@@ -1,6 +1,36 @@
|
|||||||
## Changelog
|
## 1.5.0-SNAPSHOT
|
||||||
|
|
||||||
### Unreleased
|
### Language Features
|
||||||
|
- Added `return` statement with local and non-local exit support (`return@label`).
|
||||||
|
- Support for `abstract` classes, methods, and variables.
|
||||||
|
- Introduced `interface` as a synonym for `abstract class`.
|
||||||
|
- Multiple Inheritance (MI) completed and enabled by default (C3 MRO).
|
||||||
|
- Class properties with custom accessors (`get`, `set`).
|
||||||
|
- Restricted setter visibility (`private set`, `protected set`).
|
||||||
|
- Late-initialized `val` fields in classes with `Unset` protection.
|
||||||
|
- Named arguments (`name: value`) and named splats (`...Map`).
|
||||||
|
- Assign-if-null operator `?=`.
|
||||||
|
- Refined `protected` visibility rules and `closed` modifier.
|
||||||
|
- Transient attribute `@Transient` for serialization and equality.
|
||||||
|
- Unified Delegation model for `val`, `var`, and `fun`.
|
||||||
|
- Singleton objects (`object`) and object expressions.
|
||||||
|
|
||||||
|
### Standard Library
|
||||||
|
- Added `with(self, block)` for scoped execution.
|
||||||
|
- Added `clamp()` function and extension.
|
||||||
|
- Improved `Exception` and `StackTraceEntry` reporting.
|
||||||
|
|
||||||
|
### Tooling and IDE
|
||||||
|
- **CLI**: Added `fmt` as a first-class subcommand for code formatting.
|
||||||
|
- **IDEA Plugin**: Lightweight autocompletion (experimental), improved docs, and Grazie integration.
|
||||||
|
- **Highlighters**: Updated TextMate bundle and website highlighters for new syntax.
|
||||||
|
|
||||||
|
### Detailed Changes:
|
||||||
|
|
||||||
|
- Language: Refined `protected` visibility rules
|
||||||
|
- Ancestor classes can now access `protected` members of their descendants, provided the ancestor also defines or inherits a member with the same name (indicating an override of a member known to the ancestor).
|
||||||
|
- This allows patterns where a base class calls a `protected` method that is implemented in a subclass.
|
||||||
|
- Fixed a regression where self-calls to unmangled members sometimes bypassed visibility checks incorrectly; these are now handled by the refined logic.
|
||||||
|
|
||||||
- Language: Added `return` statement
|
- Language: Added `return` statement
|
||||||
- `return [expression]` exits the innermost enclosing callable (function or lambda).
|
- `return [expression]` exits the innermost enclosing callable (function or lambda).
|
||||||
@@ -21,6 +51,12 @@
|
|||||||
- MI Satisfaction: Abstract requirements are automatically satisfied by matching concrete members found later in the C3 MRO chain without requiring explicit proxy methods.
|
- MI Satisfaction: Abstract requirements are automatically satisfied by matching concrete members found later in the C3 MRO chain without requiring explicit proxy methods.
|
||||||
- Integration: Updated highlighters (lynglib, lyngweb, IDEA plugin), IDEA completion, and Grazie grammar checking.
|
- Integration: Updated highlighters (lynglib, lyngweb, IDEA plugin), IDEA completion, and Grazie grammar checking.
|
||||||
- Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
|
- Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
|
||||||
|
- IDEA plugin: Improved natural language support and spellchecking
|
||||||
|
- Disabled the limited built-in English and Technical dictionaries.
|
||||||
|
- Enforced usage of the platform's standard Natural Languages (Grazie) and Spellchecker components.
|
||||||
|
- Integrated `SpellCheckerManager` for word suggestions and validation, respecting users' personal and project dictionaries.
|
||||||
|
- Added project-specific "learned words" support via `Lyng Formatter` settings and quick-fixes.
|
||||||
|
- Enhanced fallback spellchecker for technical terms and Lyng-specific vocabulary.
|
||||||
|
|
||||||
- Language: Class properties with accessors
|
- Language: Class properties with accessors
|
||||||
- Support for `val` (read-only) and `var` (read-write) properties in classes.
|
- Support for `val` (read-only) and `var` (read-write) properties in classes.
|
||||||
@@ -90,7 +126,7 @@
|
|||||||
- Header-specified constructor arguments are passed to direct bases.
|
- Header-specified constructor arguments are passed to direct bases.
|
||||||
- Visibility enforcement under MI:
|
- Visibility enforcement under MI:
|
||||||
- `private` visible only inside the declaring class body.
|
- `private` visible only inside the declaring class body.
|
||||||
- `protected` visible inside the declaring class and any of its transitive subclasses; unrelated contexts cannot access it (qualification/casts do not bypass).
|
- `protected` visible inside the declaring class and its transitive subclasses. Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Unrelated contexts cannot access it (qualification/casts do not bypass).
|
||||||
- Diagnostics improvements:
|
- Diagnostics improvements:
|
||||||
- Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
|
- Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
|
||||||
- Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.
|
- Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.
|
||||||
@@ -98,16 +134,6 @@
|
|||||||
|
|
||||||
- Documentation updated (docs/OOP.md and tutorial quick-start) to reflect MI with active C3 MRO.
|
- Documentation updated (docs/OOP.md and tutorial quick-start) to reflect MI with active C3 MRO.
|
||||||
|
|
||||||
Notes:
|
|
||||||
- Existing single-inheritance code continues to work; resolution reduces to the single base.
|
|
||||||
- If code previously relied on non-deterministic parent set iteration, C3 MRO provides a predictable order; disambiguate explicitly if needed using `this@Type`/casts.
|
|
||||||
|
|
||||||
# Changelog
|
|
||||||
|
|
||||||
All notable changes to this project will be documented in this file.
|
|
||||||
|
|
||||||
## Unreleased
|
|
||||||
|
|
||||||
- CLI: Added `fmt` as a first-class Clikt subcommand.
|
- CLI: Added `fmt` as a first-class Clikt subcommand.
|
||||||
- Default behavior: formats files to stdout (no in-place edits by default).
|
- Default behavior: formats files to stdout (no in-place edits by default).
|
||||||
- Options:
|
- Options:
|
||||||
|
|||||||
+116
@@ -0,0 +1,116 @@
|
|||||||
|
# Lyng Language AI Specification (V1.5.0-SNAPSHOT)
|
||||||
|
|
||||||
|
High-density specification for LLMs. Reference this for all Lyng code generation.
|
||||||
|
|
||||||
|
## 1. Core Philosophy & Syntax
|
||||||
|
- **Everything is an Expression**: Blocks, `if`, `when`, `for`, `while`, `do-while` return their last expression (or `void`).
|
||||||
|
- **Loops with `else`**: `for`, `while`, and `do-while` support an optional `else` block.
|
||||||
|
- `else` executes **only if** the loop finishes normally (without a `break`).
|
||||||
|
- `break <value>` exits the loop and sets its return value.
|
||||||
|
- Loop Return Value:
|
||||||
|
1. Value from `break <value>`.
|
||||||
|
2. Result of `else` block (if loop finished normally and `else` exists).
|
||||||
|
3. Result of the last iteration (if loop finished normally and no `else`).
|
||||||
|
4. `void` (if loop body never executed and no `else`).
|
||||||
|
- **Implicit Coroutines**: All functions are coroutines. No `async/await`. Use `launch { ... }` (returns `Deferred`) or `flow { ... }`.
|
||||||
|
- **Variables**: `val` (read-only), `var` (mutable). Supports late-init `val` in classes (must be assigned in `init` or body).
|
||||||
|
- **Serialization**: Use `@Transient` attribute before `val`/`var` or constructor parameters to exclude them from Lynon/JSON serialization. Transient fields are also ignored during `==` structural equality checks.
|
||||||
|
- **Null Safety**: `?` (nullable type), `?.` (safe access), `?( )` (safe invoke), `?{ }` (safe block invoke), `?[ ]` (safe index), `?:` or `??` (elvis), `?=` (assign-if-null).
|
||||||
|
- **Equality**: `==` (equals), `!=` (not equals), `===` (ref identity), `!==` (ref not identity).
|
||||||
|
- **Comparison**: `<`, `>`, `<=`, `>=`, `<=>` (shuttle/spaceship, returns -1, 0, 1).
|
||||||
|
- **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)
|
||||||
|
- **Multiple Inheritance**: Supported with **C3 MRO** (Python-style). Diamond-safe.
|
||||||
|
- **Header Arguments**: `class Foo(a, b) : Base(a)` defines fields `a`, `b` and passes `a` to `Base`.
|
||||||
|
- **Members**: `fun name(args) { ... }`, `val`, `var`, `static val`, `static fun`.
|
||||||
|
- **Properties (Get/Set)**: Pure accessors, no auto-backing fields.
|
||||||
|
```lyng
|
||||||
|
var age
|
||||||
|
get() = _age
|
||||||
|
private set(v) { if(v >= 0) _age = v }
|
||||||
|
// Laconic syntax:
|
||||||
|
val area get = π * r * r
|
||||||
|
```
|
||||||
|
- **Mandatory `override`**: Required for all members existing in the ancestor chain.
|
||||||
|
- **Visibility**: `public` (default), `protected` (subclasses and ancestors for overrides), `private` (this class instance only). `private set` / `protected set` allowed on properties.
|
||||||
|
- **Disambiguation**: `this@Base.member()` or `(obj as Base).member()`. `as` returns a qualified view.
|
||||||
|
- **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.
|
||||||
|
- **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`)
|
||||||
|
Unified model for `val`, `var`, and `fun`.
|
||||||
|
```lyng
|
||||||
|
val x by MyDelegate()
|
||||||
|
var y by Map() // Uses "y" as key in map
|
||||||
|
fn f(a, b) by RemoteProxy() // Calls Proxy.invoke(thisRef, "f", a, b)
|
||||||
|
```
|
||||||
|
Delegate Methods:
|
||||||
|
- `getValue(thisRef, name)`: for `val`/`var`.
|
||||||
|
- `setValue(thisRef, name, val)`: for `var`.
|
||||||
|
- `invoke(thisRef, name, args...)`: for `fn` (called if `getValue` is absent).
|
||||||
|
- `bind(name, access, thisRef)`: optional hook called at declaration/binding time. `access` is `DelegateAccess.Val`, `Var`, or `Callable`.
|
||||||
|
|
||||||
|
## 4. Standard Library & Functional Built-ins
|
||||||
|
- **Scope Functions**:
|
||||||
|
- `obj.let { it... }`: result of block. `it` is `obj`.
|
||||||
|
- `obj.apply { this... }`: returns `obj`. `this` is `obj`.
|
||||||
|
- `obj.also { it... }`: returns `obj`. `it` is `obj`.
|
||||||
|
- `obj.run { this... }`: result of block. `this` is `obj`.
|
||||||
|
- `with(obj, { ... })`: result of block. `this` is `obj`.
|
||||||
|
- **Functional**: `forEach`, `map`, `filter`, `any`, `all`, `sum`, `count`, `sortedBy`, `flatten`, `flatMap`, `associateBy`.
|
||||||
|
- **Lazy**: `val x = cached { expensive() }` (call as `x()`) or `val x by lazy { ... }`.
|
||||||
|
- **Collections**: `List` ( `[a, b]` ), `Map` ( `Map(k => v)` ), `Set` ( `Set(a, b)` ). `MapEntry` ( `k => v` ).
|
||||||
|
|
||||||
|
## 5. Patterns & Shorthands
|
||||||
|
- **Map Literals**: `{ key: value, identifier: }` (identifier shorthand `x:` is `x: x`). Empty map is `{:}`.
|
||||||
|
- **Named Arguments**: `fun(y: 10, x: 5)`. Shorthand: `Point(x:, y:)`.
|
||||||
|
- **Varargs & Splats**: `fun f(args...)`, `f(...otherList)`.
|
||||||
|
- **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).
|
||||||
|
|
||||||
|
## 6. Operators & Methods to Overload
|
||||||
|
| Op | Method | Op | Method |
|
||||||
|
| :--- | :--- | :--- | :--- |
|
||||||
|
| `+` | `plus` | `==` | `equals` |
|
||||||
|
| `-` | `minus` | `<=>` | `compareTo` |
|
||||||
|
| `*` | `mul` | `[]` | `getAt` / `putAt` |
|
||||||
|
| `/` | `div` | `!` | `logicalNot` |
|
||||||
|
| `%` | `mod` | `-` | `negate` (unary) |
|
||||||
|
| `=~` | `operatorMatch` | `+=` | `plusAssign` |
|
||||||
|
|
||||||
|
## 7. Common Snippets
|
||||||
|
```lyng
|
||||||
|
// Multiple Inheritance and Properties
|
||||||
|
class Warrior(id, hp) : Character(id), HealthPool(hp) {
|
||||||
|
override fun toString() = "Warrior #%s (%s HP)"(id, hp)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Map entry and merging
|
||||||
|
val m = Map("a" => 1) + ("b" => 2)
|
||||||
|
m += "c" => 3
|
||||||
|
|
||||||
|
// Destructuring with splat
|
||||||
|
val [first, middle..., last] = [1, 2, 3, 4, 5]
|
||||||
|
|
||||||
|
// Safe Navigation and Elvis
|
||||||
|
val companyName = person?.job?.company?.name ?: "Freelancer"
|
||||||
|
```
|
||||||
|
|
||||||
|
## 8. Standard Library Discovery
|
||||||
|
To collect data on the standard library and available APIs, AI should inspect:
|
||||||
|
- **Global Symbols**: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Script.kt` (root functions like `println`, `sqrt`, `assert`).
|
||||||
|
- **Core Type Members**: `lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/*.kt` (e.g., `ObjList.kt`, `ObjString.kt`, `ObjMap.kt`) for methods on built-in types.
|
||||||
|
- **Lyng-side Extensions**: `lynglib/stdlib/lyng/root.lyng` for high-level functional APIs (e.g., `map`, `filter`, `any`, `lazy`).
|
||||||
|
- **I/O & Processes**: `lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/` for `fs` and `process` modules.
|
||||||
|
- **Documentation**: `docs/*.md` (e.g., `tutorial.md`, `lyngio.md`) for high-level usage and module overviews.
|
||||||
@@ -25,6 +25,16 @@ Point(x:, y:).dist() //< 5
|
|||||||
fun swapEnds(first, args..., last, f) {
|
fun swapEnds(first, args..., last, f) {
|
||||||
f( last, ...args, first)
|
f( last, ...args, first)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
```
|
```
|
||||||
|
|
||||||
- extremely simple Kotlin integration on any platform (JVM, JS, WasmJS, Lunux, MacOS, iOS, Windows)
|
- extremely simple Kotlin integration on any platform (JVM, JS, WasmJS, Lunux, MacOS, iOS, Windows)
|
||||||
@@ -38,6 +48,7 @@ fun swapEnds(first, args..., last, f) {
|
|||||||
|
|
||||||
- [Language home](https://lynglang.com)
|
- [Language home](https://lynglang.com)
|
||||||
- [introduction and tutorial](docs/tutorial.md) - start here please
|
- [introduction and tutorial](docs/tutorial.md) - start here please
|
||||||
|
- [What's New in 1.5](docs/whats_new_1_5.md)
|
||||||
- [Testing and Assertions](docs/Testing.md)
|
- [Testing and Assertions](docs/Testing.md)
|
||||||
- [Filesystem and Processes (lyngio)](docs/lyngio.md)
|
- [Filesystem and Processes (lyngio)](docs/lyngio.md)
|
||||||
- [Return Statement](docs/return_statement.md)
|
- [Return Statement](docs/return_statement.md)
|
||||||
@@ -45,6 +56,7 @@ fun swapEnds(first, args..., last, f) {
|
|||||||
- [Samples directory](docs/samples)
|
- [Samples directory](docs/samples)
|
||||||
- [Formatter (core + CLI + IDE)](docs/formatter.md)
|
- [Formatter (core + CLI + IDE)](docs/formatter.md)
|
||||||
- [Books directory](docs)
|
- [Books directory](docs)
|
||||||
|
- [AI agent guidance](AGENTS.md)
|
||||||
|
|
||||||
## Integration in Kotlin multiplatform
|
## Integration in Kotlin multiplatform
|
||||||
|
|
||||||
@@ -52,7 +64,7 @@ fun swapEnds(first, args..., last, f) {
|
|||||||
|
|
||||||
```kotlin
|
```kotlin
|
||||||
// update to current please:
|
// update to current please:
|
||||||
val lyngVersion = "0.6.1-SNAPSHOT"
|
val lyngVersion = "1.5.0-SNAPSHOT"
|
||||||
|
|
||||||
repositories {
|
repositories {
|
||||||
// ...
|
// ...
|
||||||
@@ -140,6 +152,12 @@ Tips:
|
|||||||
- After a dot, globals are intentionally suppressed (e.g., `lines().Path` is not valid), only the receiver’s members are suggested.
|
- After a dot, globals are intentionally suppressed (e.g., `lines().Path` is not valid), only the receiver’s members are suggested.
|
||||||
- If completion seems sparse, make sure related modules are imported (e.g., `import lyng.io.fs` so that `Path` and its methods are known).
|
- If completion seems sparse, make sure related modules are imported (e.g., `import lyng.io.fs` so that `Path` and its methods are known).
|
||||||
|
|
||||||
|
## AI Assistant Support
|
||||||
|
|
||||||
|
To help AI assistants (like Cursor, Windsurf, or GitHub Copilot) understand Lyng with minimal effort, we provide a high-density language specification:
|
||||||
|
|
||||||
|
- **[LYNG_AI_SPEC.md](LYNG_AI_SPEC.md)**: A concise guide for AI models to learn Lyng syntax, idioms, and core philosophy. We recommend pointing your AI tool to this file or including it in your project's custom instructions.
|
||||||
|
|
||||||
## Why?
|
## Why?
|
||||||
|
|
||||||
Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
|
Designed to add scripting to kotlin multiplatform application in easy and efficient way. This is attempt to achieve what Lua is for C/++.
|
||||||
@@ -159,7 +177,7 @@ Designed to add scripting to kotlin multiplatform application in easy and effici
|
|||||||
|
|
||||||
# Language Roadmap
|
# Language Roadmap
|
||||||
|
|
||||||
We are now at **v1.0**: basic optimization performed, battery included: standard library is 90% here, initial
|
We are now at **v1.5.0-SNAPSHOT** (stable development cycle): basic optimization performed, battery included: standard library is 90% here, initial
|
||||||
support in HTML, popular editors, and IDEA; tools to syntax highlight and format code are ready. It was released closed to schedule.
|
support in HTML, popular editors, and IDEA; tools to syntax highlight and format code are ready. It was released closed to schedule.
|
||||||
|
|
||||||
Ready features:
|
Ready features:
|
||||||
@@ -199,7 +217,7 @@ Ready features:
|
|||||||
|
|
||||||
All of this is documented in the [language site](https://lynglang.com) and locally [docs/language.md](docs/tutorial.md). the current nightly builds published on the site and in the private maven repository.
|
All of this is documented in the [language site](https://lynglang.com) and locally [docs/language.md](docs/tutorial.md). the current nightly builds published on the site and in the private maven repository.
|
||||||
|
|
||||||
## plan: towards v1.5 Enhancing
|
## plan: towards v2.0 Next Generation
|
||||||
|
|
||||||
- [x] site with integrated interpreter to give a try
|
- [x] site with integrated interpreter to give a try
|
||||||
- [x] kotlin part public API good docs, integration focused
|
- [x] kotlin part public API good docs, integration focused
|
||||||
@@ -225,4 +243,4 @@ __Sergey Chernov__ @sergeych: Initial idea and architecture, language concept, d
|
|||||||
|
|
||||||
__Yulia Nezhinskaya__ @AlterEgoJuliaN: System analysis, math and features design.
|
__Yulia Nezhinskaya__ @AlterEgoJuliaN: System analysis, math and features design.
|
||||||
|
|
||||||
[parallelism]: docs/parallelism.md
|
[parallelism]: docs/parallelism.md
|
||||||
Executable
+26
@@ -0,0 +1,26 @@
|
|||||||
|
#!/bin/sh
|
||||||
|
|
||||||
|
#
|
||||||
|
# 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.
|
||||||
|
#
|
||||||
|
#
|
||||||
|
|
||||||
|
set -e
|
||||||
|
|
||||||
|
echo
|
||||||
|
echo "Creating plugin"
|
||||||
|
echo
|
||||||
|
./gradlew buildInstallablePlugin
|
||||||
|
deploy_site -u
|
||||||
+38
-26
@@ -1,7 +1,7 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
|
|
||||||
#
|
#
|
||||||
# Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
# Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -17,6 +17,14 @@
|
|||||||
#
|
#
|
||||||
#
|
#
|
||||||
|
|
||||||
|
upload_only=false
|
||||||
|
for arg in "$@"; do
|
||||||
|
if [[ "$arg" == "-u" || "$arg" == "--upload-only" ]]; then
|
||||||
|
upload_only=true
|
||||||
|
break
|
||||||
|
fi
|
||||||
|
done
|
||||||
|
|
||||||
function checkState() {
|
function checkState() {
|
||||||
if [[ $? != 0 ]]; then
|
if [[ $? != 0 ]]; then
|
||||||
echo
|
echo
|
||||||
@@ -24,9 +32,10 @@ function checkState() {
|
|||||||
echo
|
echo
|
||||||
exit 100
|
exit 100
|
||||||
fi
|
fi
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
# Update docs/idea_plugin.md to point to the latest built IDEA plugin zip
|
# Update docs/idea_plugin.md to point to the latest built IDEA plugin zip
|
||||||
# from ./distributables before building the site. The change is temporary and
|
# from ./distributables before building the site. The change is temporary and
|
||||||
# the original file is restored right after the build.
|
# the original file is restored right after the build.
|
||||||
@@ -107,28 +116,28 @@ function refreshTextmateZip() {
|
|||||||
(cd editors && zip -rq ../distributables/lyng-textmate.zip .)
|
(cd editors && zip -rq ../distributables/lyng-textmate.zip .)
|
||||||
}
|
}
|
||||||
|
|
||||||
# Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
|
|
||||||
refreshTextmateZip
|
|
||||||
updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
|
|
||||||
|
|
||||||
./gradlew site:jsBrowserDistribution
|
if [[ "$upload_only" == false ]]; then
|
||||||
BUILD_RC=$?
|
# Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
|
||||||
|
refreshTextmateZip
|
||||||
|
updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
|
||||||
|
|
||||||
# Always restore original doc if backup exists
|
./gradlew site:jsBrowserDistribution
|
||||||
if [[ -f "$DOC_IDEA_PLUGIN_BACKUP" ]]; then
|
BUILD_RC=$?
|
||||||
mv -f "$DOC_IDEA_PLUGIN_BACKUP" "$DOC_IDEA_PLUGIN"
|
|
||||||
|
# Always restore original doc if backup exists
|
||||||
|
if [[ -f "$DOC_IDEA_PLUGIN_BACKUP" ]]; then
|
||||||
|
mv -f "$DOC_IDEA_PLUGIN_BACKUP" "$DOC_IDEA_PLUGIN"
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ $BUILD_RC -ne 0 ]]; then
|
||||||
|
echo
|
||||||
|
echo -- build failed. deploy aborted.
|
||||||
|
echo
|
||||||
|
exit 100
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if [[ $BUILD_RC -ne 0 ]]; then
|
|
||||||
echo
|
|
||||||
echo -- build failed. deploy aborted.
|
|
||||||
echo
|
|
||||||
exit 100
|
|
||||||
fi
|
|
||||||
|
|
||||||
|
|
||||||
#exit 0
|
|
||||||
|
|
||||||
# Prepare working dir
|
# Prepare working dir
|
||||||
ssh -p ${SSH_PORT} ${SSH_HOST} "
|
ssh -p ${SSH_PORT} ${SSH_HOST} "
|
||||||
cd ${ROOT}
|
cd ${ROOT}
|
||||||
@@ -143,12 +152,15 @@ ssh -p ${SSH_PORT} ${SSH_HOST} "
|
|||||||
fi
|
fi
|
||||||
";
|
";
|
||||||
|
|
||||||
# sync files
|
if [[ "$upload_only" == false ]]; then
|
||||||
SRC=./site/build/dist/js/productionExecutable
|
# sync files
|
||||||
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
|
SRC=./site/build/dist/js/productionExecutable
|
||||||
checkState
|
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
|
||||||
#rsync -e "ssh -p ${SSH_PORT}" -avz ./static/* ${SSH_HOST}:${ROOT}/build/dist
|
checkState
|
||||||
#checkState
|
#rsync -e "ssh -p ${SSH_PORT}" -avz ./static/* ${SSH_HOST}:${ROOT}/build/dist
|
||||||
|
#checkState
|
||||||
|
fi
|
||||||
|
|
||||||
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete distributables/* ${SSH_HOST}:${ROOT}/build/dist/distributables
|
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete distributables/* ${SSH_HOST}:${ROOT}/build/dist/distributables
|
||||||
checkState
|
checkState
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# Bytecode Migration Plan (Archived)
|
||||||
|
|
||||||
|
Status: completed.
|
||||||
|
|
||||||
|
Historical reference:
|
||||||
|
- `notes/archive/bytecode_migration_plan.md` (full plan)
|
||||||
|
- `notes/archive/bytecode_migration_plan_completed.md` (summary)
|
||||||
@@ -0,0 +1,280 @@
|
|||||||
|
# Lyng Bytecode VM Spec v0 (Draft)
|
||||||
|
|
||||||
|
This document describes a register-like (3-address) bytecode for Lyng with
|
||||||
|
dynamic slot width (8/16/32-bit slot IDs), a slot-tail argument model, and
|
||||||
|
typed lanes for Obj/Int/Real/Bool. The VM is intended to run as a suspendable
|
||||||
|
interpreter and fall back to the existing AST execution when needed.
|
||||||
|
|
||||||
|
## 1) Frame & Slot Model
|
||||||
|
|
||||||
|
### Frame metadata
|
||||||
|
- localCount: number of local slots for this function (fixed at compile time).
|
||||||
|
- argCount: number of arguments passed at call time.
|
||||||
|
- scopeSlotNames: optional debug names for scope slots (locals/params), aligned to slot mapping.
|
||||||
|
- argBase = localCount.
|
||||||
|
|
||||||
|
### Slot layout
|
||||||
|
slots[0 .. localCount-1] locals
|
||||||
|
slots[localCount .. localCount+argCount-1] arguments
|
||||||
|
|
||||||
|
### Typed lanes
|
||||||
|
- slotType[]: UNKNOWN/OBJ/INT/REAL/BOOL
|
||||||
|
- objSlots[], intSlots[], realSlots[], boolSlots[]
|
||||||
|
- A slot is a logical index; active lane is selected by slotType.
|
||||||
|
|
||||||
|
### Parameter access
|
||||||
|
- param i => slot localCount + i
|
||||||
|
- variadic extra => slot localCount + declaredParamCount + k
|
||||||
|
|
||||||
|
### Debug metadata (optional)
|
||||||
|
- scopeSlotNames: array sized scopeSlotCount, each entry nullable.
|
||||||
|
- Intended for disassembly/debug tooling; VM semantics do not depend on it.
|
||||||
|
|
||||||
|
### Constant pool extras
|
||||||
|
- SlotPlan: map of name -> slot index, used by PUSH_SCOPE to pre-allocate and map loop locals.
|
||||||
|
- CallArgsPlan: ordered argument specs (name/splat) + tailBlock flag, used when argCount has the plan flag set.
|
||||||
|
|
||||||
|
## 2) Slot ID Width
|
||||||
|
|
||||||
|
Per frame, select:
|
||||||
|
- 8-bit if localCount + argCount < 256
|
||||||
|
- 16-bit if < 65536
|
||||||
|
- 32-bit otherwise
|
||||||
|
|
||||||
|
The decoder uses a dedicated loop per width. All slot operands are expanded to
|
||||||
|
Int internally.
|
||||||
|
|
||||||
|
## 3) CALL Semantics (Model A)
|
||||||
|
|
||||||
|
Instruction:
|
||||||
|
CALL_DIRECT fnId, argBase, argCount, dst
|
||||||
|
|
||||||
|
Behavior:
|
||||||
|
- Allocate a callee frame sized localCount + argCount.
|
||||||
|
- Copy caller slots [argBase .. argBase+argCount-1] into callee slots
|
||||||
|
[localCount .. localCount+argCount-1].
|
||||||
|
- Callee returns via RET slot or RET_VOID.
|
||||||
|
- Caller stores return value to dst.
|
||||||
|
|
||||||
|
Other calls:
|
||||||
|
- CALL_VIRTUAL recvSlot, methodId, argBase, argCount, dst
|
||||||
|
- CALL_FALLBACK stmtId, argBase, argCount, dst
|
||||||
|
- CALL_SLOT calleeSlot, argBase, argCount, dst
|
||||||
|
|
||||||
|
## 4) Binary Encoding Layout
|
||||||
|
|
||||||
|
All instructions are:
|
||||||
|
[opcode:U8] [operands...]
|
||||||
|
|
||||||
|
Operand widths:
|
||||||
|
- slotId: S = 1/2/4 bytes (per frame slot width)
|
||||||
|
- constId: K = 2 bytes (U16), extend to 4 if needed
|
||||||
|
- ip: I = 2 bytes (U16) or 4 bytes (U32) per function size
|
||||||
|
- fnId/methodId/stmtId: F/M/T = 2 bytes (U16) unless extended
|
||||||
|
- argCount: C = 2 bytes (U16), extend to 4 if needed
|
||||||
|
|
||||||
|
Endianness: little-endian for multi-byte operands.
|
||||||
|
|
||||||
|
Common operand patterns:
|
||||||
|
- S: one slot
|
||||||
|
- SS: two slots
|
||||||
|
- SSS: three slots
|
||||||
|
- K S: constId + dst slot
|
||||||
|
- S I: slot + jump target
|
||||||
|
- I: jump target
|
||||||
|
- F S C S: fnId, argBase slot, argCount, dst slot
|
||||||
|
|
||||||
|
Arg count flag:
|
||||||
|
- If high bit of C is set (0x8000), the low 15 bits encode a CallArgsPlan constId.
|
||||||
|
- When not set, C is the raw positional count and tailBlockMode=false.
|
||||||
|
|
||||||
|
## 5) Opcode Table
|
||||||
|
|
||||||
|
Note: Any opcode can be compiled to FALLBACK if not implemented in a VM pass.
|
||||||
|
|
||||||
|
### Data movement
|
||||||
|
- NOP
|
||||||
|
- MOVE_OBJ S -> S
|
||||||
|
- MOVE_INT S -> S
|
||||||
|
- MOVE_REAL S -> S
|
||||||
|
- MOVE_BOOL S -> S
|
||||||
|
- BOX_OBJ S -> S
|
||||||
|
- CONST_OBJ K -> S
|
||||||
|
- CONST_INT K -> S
|
||||||
|
- CONST_REAL K -> S
|
||||||
|
- CONST_BOOL K -> S
|
||||||
|
- CONST_NULL -> S
|
||||||
|
|
||||||
|
### Numeric conversions
|
||||||
|
- INT_TO_REAL S -> S
|
||||||
|
- REAL_TO_INT S -> S
|
||||||
|
- BOOL_TO_INT S -> S
|
||||||
|
- INT_TO_BOOL S -> S
|
||||||
|
|
||||||
|
### Arithmetic: INT
|
||||||
|
- ADD_INT S, S -> S
|
||||||
|
- SUB_INT S, S -> S
|
||||||
|
- MUL_INT S, S -> S
|
||||||
|
- DIV_INT S, S -> S
|
||||||
|
- MOD_INT S, S -> S
|
||||||
|
- NEG_INT S -> S
|
||||||
|
- INC_INT S
|
||||||
|
- DEC_INT S
|
||||||
|
|
||||||
|
### Arithmetic: REAL
|
||||||
|
- ADD_REAL S, S -> S
|
||||||
|
- SUB_REAL S, S -> S
|
||||||
|
- MUL_REAL S, S -> S
|
||||||
|
- DIV_REAL S, S -> S
|
||||||
|
- NEG_REAL S -> S
|
||||||
|
|
||||||
|
### Arithmetic: OBJ
|
||||||
|
- ADD_OBJ S, S -> S
|
||||||
|
- SUB_OBJ S, S -> S
|
||||||
|
- MUL_OBJ S, S -> S
|
||||||
|
- DIV_OBJ S, S -> S
|
||||||
|
- MOD_OBJ S, S -> S
|
||||||
|
|
||||||
|
### Bitwise: INT
|
||||||
|
- AND_INT S, S -> S
|
||||||
|
- OR_INT S, S -> S
|
||||||
|
- XOR_INT S, S -> S
|
||||||
|
- SHL_INT S, S -> S
|
||||||
|
- SHR_INT S, S -> S
|
||||||
|
- USHR_INT S, S -> S
|
||||||
|
- INV_INT S -> S
|
||||||
|
|
||||||
|
### Comparisons (typed)
|
||||||
|
- CMP_EQ_INT S, S -> S
|
||||||
|
- CMP_NEQ_INT S, S -> S
|
||||||
|
- CMP_LT_INT S, S -> S
|
||||||
|
- CMP_LTE_INT S, S -> S
|
||||||
|
- CMP_GT_INT S, S -> S
|
||||||
|
- CMP_GTE_INT S, S -> S
|
||||||
|
- CMP_EQ_REAL S, S -> S
|
||||||
|
- CMP_NEQ_REAL S, S -> S
|
||||||
|
- CMP_LT_REAL S, S -> S
|
||||||
|
- CMP_LTE_REAL S, S -> S
|
||||||
|
- CMP_GT_REAL S, S -> S
|
||||||
|
- CMP_GTE_REAL S, S -> S
|
||||||
|
- CMP_EQ_BOOL S, S -> S
|
||||||
|
- CMP_NEQ_BOOL S, S -> S
|
||||||
|
|
||||||
|
### Mixed numeric comparisons
|
||||||
|
- CMP_EQ_INT_REAL S, S -> S
|
||||||
|
- CMP_EQ_REAL_INT S, S -> S
|
||||||
|
- CMP_LT_INT_REAL S, S -> S
|
||||||
|
- CMP_LT_REAL_INT S, S -> S
|
||||||
|
- CMP_LTE_INT_REAL S, S -> S
|
||||||
|
- CMP_LTE_REAL_INT S, S -> S
|
||||||
|
- CMP_GT_INT_REAL S, S -> S
|
||||||
|
- CMP_GT_REAL_INT S, S -> S
|
||||||
|
- CMP_GTE_INT_REAL S, S -> S
|
||||||
|
- CMP_GTE_REAL_INT S, S -> S
|
||||||
|
- CMP_NEQ_INT_REAL S, S -> S
|
||||||
|
- CMP_NEQ_REAL_INT S, S -> S
|
||||||
|
- CMP_EQ_OBJ S, S -> S
|
||||||
|
- CMP_NEQ_OBJ S, S -> S
|
||||||
|
- CMP_REF_EQ_OBJ S, S -> S
|
||||||
|
- CMP_REF_NEQ_OBJ S, S -> S
|
||||||
|
- CMP_LT_OBJ S, S -> S
|
||||||
|
- CMP_LTE_OBJ S, S -> S
|
||||||
|
- CMP_GT_OBJ S, S -> S
|
||||||
|
- CMP_GTE_OBJ S, S -> S
|
||||||
|
|
||||||
|
### Boolean ops
|
||||||
|
- NOT_BOOL S -> S
|
||||||
|
- AND_BOOL S, S -> S
|
||||||
|
- OR_BOOL S, S -> S
|
||||||
|
|
||||||
|
### Control flow
|
||||||
|
- JMP I
|
||||||
|
- JMP_IF_TRUE S, I
|
||||||
|
- JMP_IF_FALSE S, I
|
||||||
|
- RET S
|
||||||
|
- RET_VOID
|
||||||
|
- PUSH_SCOPE K
|
||||||
|
- POP_SCOPE
|
||||||
|
|
||||||
|
### Scope setup
|
||||||
|
- PUSH_SCOPE uses const `SlotPlan` (name -> slot index) to create a child scope and apply slot mapping.
|
||||||
|
- POP_SCOPE restores the parent scope.
|
||||||
|
|
||||||
|
### Calls
|
||||||
|
- CALL_DIRECT F, S, C, S
|
||||||
|
- CALL_VIRTUAL S, M, S, C, S
|
||||||
|
- CALL_FALLBACK T, S, C, S
|
||||||
|
- CALL_SLOT S, S, C, S
|
||||||
|
|
||||||
|
### Object access (optional, later)
|
||||||
|
- GET_FIELD S, M -> S
|
||||||
|
- SET_FIELD S, M, S
|
||||||
|
- GET_INDEX S, S -> S
|
||||||
|
- SET_INDEX S, S, S
|
||||||
|
|
||||||
|
### Fallback
|
||||||
|
- EVAL_FALLBACK T -> S
|
||||||
|
|
||||||
|
## 6) Const Pool Encoding (v0)
|
||||||
|
|
||||||
|
Each const entry is encoded as:
|
||||||
|
[tag:U8] [payload...]
|
||||||
|
|
||||||
|
Tags:
|
||||||
|
- 0x00: NULL
|
||||||
|
- 0x01: BOOL (payload: U8 0/1)
|
||||||
|
- 0x02: INT (payload: S64, little-endian)
|
||||||
|
- 0x03: REAL (payload: F64, IEEE-754, little-endian)
|
||||||
|
- 0x04: STRING (payload: U32 length + UTF-8 bytes)
|
||||||
|
- 0x05: OBJ_REF (payload: U32 index into external Obj table)
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- OBJ_REF is reserved for embedding prebuilt Obj handles if needed.
|
||||||
|
- Strings use UTF-8; length is bytes, not chars.
|
||||||
|
|
||||||
|
## 7) Function Header (binary container)
|
||||||
|
|
||||||
|
Suggested layout for a bytecode function blob:
|
||||||
|
- magic: U32 ("LYBC")
|
||||||
|
- version: U16 (0x0001)
|
||||||
|
- slotWidth: U8 (1,2,4)
|
||||||
|
- ipWidth: U8 (2,4)
|
||||||
|
- constIdWidth: U8 (2,4)
|
||||||
|
- localCount: U32
|
||||||
|
- codeSize: U32 (bytes)
|
||||||
|
- constCount: U32
|
||||||
|
- constPool: [const entries...]
|
||||||
|
- code: [bytecode...]
|
||||||
|
|
||||||
|
Const pool entries use the encoding described in section 6.
|
||||||
|
|
||||||
|
## 8) Sample Bytecode (illustrative)
|
||||||
|
|
||||||
|
Example Lyng:
|
||||||
|
val x = 2
|
||||||
|
val y = 3
|
||||||
|
val z = x + y
|
||||||
|
|
||||||
|
Assume:
|
||||||
|
- localCount = 3 (x,y,z)
|
||||||
|
- argCount = 0
|
||||||
|
- slot width = 1 byte
|
||||||
|
- const pool: [INT 2, INT 3]
|
||||||
|
|
||||||
|
Bytecode:
|
||||||
|
CONST_INT k0 -> s0
|
||||||
|
CONST_INT k1 -> s1
|
||||||
|
ADD_INT s0, s1 -> s2
|
||||||
|
RET_VOID
|
||||||
|
|
||||||
|
Encoded (opcode values symbolic):
|
||||||
|
[OP_CONST_INT][k0][s0]
|
||||||
|
[OP_CONST_INT][k1][s1]
|
||||||
|
[OP_ADD_INT][s0][s1][s2]
|
||||||
|
[OP_RET_VOID]
|
||||||
|
|
||||||
|
## 9) Notes
|
||||||
|
|
||||||
|
- Mixed-mode is allowed: compiler can emit FALLBACK ops for unsupported nodes.
|
||||||
|
- The VM must be suspendable; on suspension, store ip + minimal operand state.
|
||||||
|
- Source mapping uses a separate ip->Pos table, not part of core bytecode.
|
||||||
+74
-11
@@ -113,6 +113,48 @@ val handler = object {
|
|||||||
- **Serialization**: Anonymous objects are **not serializable**. Attempting to encode an anonymous object via `Lynon` will throw a `SerializationException`. This is because their class definition is transient and cannot be safely restored in a different session or process.
|
- **Serialization**: Anonymous objects are **not serializable**. Attempting to encode an anonymous object via `Lynon` will throw a `SerializationException`. This is because their class definition is transient and cannot be safely restored in a different session or process.
|
||||||
- **Type Identity**: Every object expression creates a unique anonymous class. Two identical object expressions will result in two different classes with distinct type identities.
|
- **Type Identity**: Every object expression creates a unique anonymous class. Two identical object expressions will result in two different classes with distinct type identities.
|
||||||
|
|
||||||
|
## Nested Declarations
|
||||||
|
|
||||||
|
Lyng allows classes, objects, enums, and type aliases to be declared inside another class. These declarations live in the **class namespace** (not the instance), so they do not capture an outer instance and are accessed with a qualifier.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
type Alias = B
|
||||||
|
enum E { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
```
|
||||||
|
|
||||||
|
Rules:
|
||||||
|
- **Qualified access**: use `Outer.Inner` for nested classes/objects/enums/aliases. Inside `Outer` you can refer to them by unqualified name unless shadowed.
|
||||||
|
- **No inner semantics**: nested declarations do not capture an instance of the outer class. They are resolved at compile time.
|
||||||
|
- **Visibility**: `private` restricts a nested declaration to the declaring class body (not visible from outside or subclasses).
|
||||||
|
- **Reflection name**: a nested class reports `Outer.Inner` (e.g., `A.B::class.name` is `"A.B"`).
|
||||||
|
- **Type aliases**: behave as aliases of the qualified nested type and are expanded by the type system.
|
||||||
|
|
||||||
|
### Lifted Enum Entries
|
||||||
|
|
||||||
|
Enums can optionally lift their entries into the surrounding class namespace using `*`:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
assertEquals(A.Two, A.E.Two)
|
||||||
|
```
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
- `E*` exposes entries in `A` as if they were direct members (`A.One`).
|
||||||
|
- If a name would conflict with an existing class member, compilation fails (no implicit fallback).
|
||||||
|
- Without `*`, use the normal `A.E.One` form.
|
||||||
|
|
||||||
## Properties
|
## Properties
|
||||||
|
|
||||||
Properties allow you to define member accessors that look like fields but execute code when read or written. Unlike regular fields, properties in Lyng do **not** have automatic backing fields; they are pure accessors.
|
Properties allow you to define member accessors that look like fields but execute code when read or written. Unlike regular fields, properties in Lyng do **not** have automatic backing fields; they are pure accessors.
|
||||||
@@ -425,7 +467,7 @@ Key rules and features:
|
|||||||
|
|
||||||
- Visibility
|
- Visibility
|
||||||
- `private`: accessible only inside the declaring class body; not visible in subclasses and cannot be accessed via `this@Type` or casts.
|
- `private`: accessible only inside the declaring class body; not visible in subclasses and cannot be accessed via `this@Type` or casts.
|
||||||
- `protected`: accessible in the declaring class and in any of its transitive subclasses (including MI), but not from unrelated contexts; qualification/casts do not bypass it.
|
- `protected`: accessible in the declaring class and in any of its transitive subclasses (including MI). Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Protected members are not visible from unrelated contexts; qualification/casts do not bypass it.
|
||||||
|
|
||||||
## Abstract Classes and Members
|
## Abstract Classes and Members
|
||||||
|
|
||||||
@@ -857,23 +899,44 @@ Private fields are visible only _inside the class instance_:
|
|||||||
void
|
void
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
### Transient fields
|
||||||
|
|
||||||
|
You can mark a field or a constructor parameter as transient using the `@Transient` attribute. Transient members are ignored during serialization (Lynon and JSON) and are also excluded from structural equality (`==`) checks.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class Session(@Transient val token, val userId) {
|
||||||
|
@Transient var lastAccess = time.now()
|
||||||
|
var data = Map()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
For more details on how transient fields behave during restoration, see the [Serialization Guide](serialization.md).
|
||||||
|
|
||||||
### Protected members
|
### Protected members
|
||||||
|
|
||||||
Protected members are available to the declaring class and all of its transitive subclasses (including via MI), but not from unrelated contexts:
|
Protected members are available to the declaring class and all of its transitive subclasses (including via MI). Additionally, an ancestor class can access a `protected` member of its descendant if the ancestor also defines or inherits a member with the same name (i.e., it is an override of something the ancestor knows about).
|
||||||
|
|
||||||
```
|
Protected members are not available from unrelated contexts:
|
||||||
class A() {
|
|
||||||
protected fun ping() { "pong" }
|
```lyng
|
||||||
}
|
class Base {
|
||||||
class B() : A() {
|
abstract protected fun foo()
|
||||||
fun call() { this@A.ping() }
|
|
||||||
|
fun bar() {
|
||||||
|
// Ancestor can see foo() because it's an override
|
||||||
|
// of a member it defines (even as abstract):
|
||||||
|
foo()
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
val b = B()
|
class Derived : Base {
|
||||||
assertEquals("pong", b.call())
|
override protected fun foo() { "ok" }
|
||||||
|
}
|
||||||
|
|
||||||
|
assertEquals("ok", Derived().bar())
|
||||||
|
|
||||||
// Unrelated access is forbidden, even via cast
|
// Unrelated access is forbidden, even via cast
|
||||||
assertThrows { (b as A).ping() }
|
assertThrows { (Derived() as Base).foo() }
|
||||||
```
|
```
|
||||||
|
|
||||||
It is possible to provide private constructor parameters so they can be
|
It is possible to provide private constructor parameters so they can be
|
||||||
|
|||||||
+32
-7
@@ -45,10 +45,11 @@ are equal or within another, taking into account the end-inclusiveness:
|
|||||||
assert( (1..<3) in (1..3) )
|
assert( (1..<3) in (1..3) )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
## Finite Ranges are iterable
|
## Ranges are iterable
|
||||||
|
|
||||||
So given a range with both ends, you can assume it is [Iterable]. This automatically let
|
Finite ranges are [Iterable] and can be used in loops and list conversions.
|
||||||
use finite ranges in loops and convert it to lists:
|
Open-ended ranges are iterable only with an explicit `step`, and open-start
|
||||||
|
ranges are never iterable.
|
||||||
|
|
||||||
assert( [-2, -1, 0, 1] == (-2..1).toList() )
|
assert( [-2, -1, 0, 1] == (-2..1).toList() )
|
||||||
>>> void
|
>>> void
|
||||||
@@ -62,6 +63,8 @@ In spite of this you can use ranges in for loops:
|
|||||||
>>> 3
|
>>> 3
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
The loop variable is read-only inside the loop body (behaves like a `val`).
|
||||||
|
|
||||||
but
|
but
|
||||||
|
|
||||||
for( i in 1..<3 )
|
for( i in 1..<3 )
|
||||||
@@ -70,6 +73,26 @@ but
|
|||||||
>>> 2
|
>>> 2
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
### Stepped ranges
|
||||||
|
|
||||||
|
Use `step` to change the iteration increment. The range bounds still define membership,
|
||||||
|
so iteration ends when the next value is no longer in the range.
|
||||||
|
|
||||||
|
assert( [1,3,5] == (1..5 step 2).toList() )
|
||||||
|
assert( [1,3] == (1..<5 step 2).toList() )
|
||||||
|
assert( ['a','c','e'] == ('a'..'e' step 2).toList() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Real ranges require an explicit step:
|
||||||
|
|
||||||
|
assert( [0,0.25,0.5,0.75,1.0] == (0.0..1.0 step 0.25).toList() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Open-ended ranges require an explicit step to iterate:
|
||||||
|
|
||||||
|
(0.. step 1).take(3).toList()
|
||||||
|
>>> [0,1,2]
|
||||||
|
|
||||||
## Character ranges
|
## Character ranges
|
||||||
|
|
||||||
You can use Char as both ends of the closed range:
|
You can use Char as both ends of the closed range:
|
||||||
@@ -98,10 +121,12 @@ Exclusive end char ranges are supported too:
|
|||||||
| isEndInclusive | true for '..' | Bool |
|
| isEndInclusive | true for '..' | Bool |
|
||||||
| isOpen | at any end | Bool |
|
| isOpen | at any end | Bool |
|
||||||
| isIntRange | both start and end are Int | Bool |
|
| isIntRange | both start and end are Int | Bool |
|
||||||
| start | | Bool |
|
| step | explicit iteration step | Any? |
|
||||||
| end | | Bool |
|
| start | | Any? |
|
||||||
|
| end | | Any? |
|
||||||
| size | for finite ranges, see above | Long |
|
| size | for finite ranges, see above | Long |
|
||||||
| [] | see above | |
|
| [] | see above | |
|
||||||
| | | |
|
|
||||||
|
|
||||||
[Iterable]: Iterable.md
|
Ranges are also used with the `clamp(value, range)` function and the `value.clamp(range)` extension method to limit values within boundaries.
|
||||||
|
|
||||||
|
[Iterable]: Iterable.md
|
||||||
@@ -19,6 +19,7 @@ you can use it's class to ensure type:
|
|||||||
|-----------------|-------------------------------------------------------------|------|
|
|-----------------|-------------------------------------------------------------|------|
|
||||||
| `.roundToInt()` | round to nearest int like round(x) | Int |
|
| `.roundToInt()` | round to nearest int like round(x) | Int |
|
||||||
| `.toInt()` | convert integer part of real to `Int` dropping decimal part | Int |
|
| `.toInt()` | convert integer part of real to `Int` dropping decimal part | Int |
|
||||||
|
| `.clamp(range)` | clamp value within range boundaries | Real |
|
||||||
| | | |
|
| | | |
|
||||||
| | | |
|
| | | |
|
||||||
| | | |
|
| | | |
|
||||||
|
|||||||
@@ -105,6 +105,7 @@ arguments list in almost arbitrary ways. For example:
|
|||||||
var result = ""
|
var result = ""
|
||||||
for( a in args ) result += a
|
for( a in args ) result += a
|
||||||
}
|
}
|
||||||
|
// loop variables are read-only inside the loop body
|
||||||
|
|
||||||
assertEquals(
|
assertEquals(
|
||||||
"4231",
|
"4231",
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# AI notes: avoid Kotlin/Wasm invalid IR with suspend lambdas
|
||||||
|
|
||||||
|
## Do
|
||||||
|
- Prefer explicit `object : Statement()` with `override suspend fun execute(...)` when building compiler statements.
|
||||||
|
- Keep `Statement` objects non-lambda, especially in compiler hot paths like parsing/var declarations.
|
||||||
|
- If you need conditional behavior, return early in `execute` instead of wrapping `parseExpression()` with `statement(...) { ... }`.
|
||||||
|
- When wasmJs tests hang in the browser, first check `wasmJsNodeTest` for a compile error; hangs often mean module instantiation failed.
|
||||||
|
|
||||||
|
## Don't
|
||||||
|
- Do not create suspend lambdas inside `Statement` factories (`statement { ... }`) for wasm targets.
|
||||||
|
- Do not "fix" hangs by increasing browser timeouts; it masks invalid wasm generation.
|
||||||
|
|
||||||
|
## Debugging tips
|
||||||
|
- Look for `$invokeCOROUTINE$` in wasm function names when mapping failures.
|
||||||
|
- If node test logs a wasm compile error, the browser hang is likely the same root cause.
|
||||||
@@ -182,6 +182,77 @@ instance.value = 42
|
|||||||
println(instance.value) // -> 42
|
println(instance.value) // -> 42
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### 6.5) Preferred: bind Kotlin implementations to declared Lyng classes
|
||||||
|
|
||||||
|
For extensions and libraries, the **preferred** workflow is Lyng‑first: declare the class and its members in Lyng, then bind the Kotlin implementations using the bridge.
|
||||||
|
|
||||||
|
This keeps Lyng semantics (visibility, overrides, type checks) in Lyng, while Kotlin supplies the behavior.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
// Lyng side (in a module)
|
||||||
|
class Counter {
|
||||||
|
extern var value: Int
|
||||||
|
extern fun inc(by: Int): Int
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Note: members must be marked `extern` so the compiler emits the ABI slots that Kotlin bindings attach to. This applies to functions and properties bound via `addFun` / `addVal` / `addVar`.
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
// Kotlin side (binding)
|
||||||
|
val moduleScope = Script.newScope() // or an existing module scope
|
||||||
|
moduleScope.eval("class Counter { extern var value: Int; extern fun inc(by: Int): Int }")
|
||||||
|
|
||||||
|
moduleScope.bind("Counter") {
|
||||||
|
addVar(
|
||||||
|
name = "value",
|
||||||
|
get = { _, self -> self.readField(this, "value").value },
|
||||||
|
set = { _, self, v -> self.writeField(this, "value", v) }
|
||||||
|
)
|
||||||
|
addFun("inc") { _, self, args ->
|
||||||
|
val by = args.requiredArg<ObjInt>(0).value
|
||||||
|
val current = self.readField(this, "value").value as ObjInt
|
||||||
|
val next = ObjInt(current.value + by)
|
||||||
|
self.writeField(this, "value", next)
|
||||||
|
next
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Notes:
|
||||||
|
|
||||||
|
- Binding must happen **before** the first instance is created.
|
||||||
|
- Use [LyngClassBridge] to bind by name/module, or by an already resolved `ObjClass`.
|
||||||
|
- Use `ObjInstance.data` / `ObjClass.classData` to attach Kotlin‑side state when needed.
|
||||||
|
|
||||||
|
### 6.6) Preferred: Kotlin reflection bridge for call‑by‑name
|
||||||
|
|
||||||
|
For Kotlin code that needs dynamic access to Lyng variables, functions, or members, use the bridge resolver.
|
||||||
|
It provides explicit, cached handles and predictable lookup rules.
|
||||||
|
|
||||||
|
```kotlin
|
||||||
|
val scope = Script.newScope()
|
||||||
|
scope.eval("""
|
||||||
|
val x = 40
|
||||||
|
fun add(a, b) = a + b
|
||||||
|
class Box { var value = 1 }
|
||||||
|
""")
|
||||||
|
|
||||||
|
val resolver = scope.resolver()
|
||||||
|
|
||||||
|
// Read a top‑level value
|
||||||
|
val x = resolver.resolveVal("x").get(scope)
|
||||||
|
|
||||||
|
// Call a function by name (cached inside the resolver)
|
||||||
|
val sum = (resolver as BridgeCallByName).callByName(scope, "add", Arguments(ObjInt(1), ObjInt(2)))
|
||||||
|
|
||||||
|
// Member access
|
||||||
|
val box = scope.eval("Box()")
|
||||||
|
val valueHandle = resolver.resolveMemberVar(box, "value")
|
||||||
|
valueHandle.set(scope, ObjInt(10))
|
||||||
|
val value = valueHandle.get(scope)
|
||||||
|
```
|
||||||
|
|
||||||
### 7) Read variable values back in Kotlin
|
### 7) Read variable values back in Kotlin
|
||||||
|
|
||||||
The simplest approach: evaluate an expression that yields the value and convert it.
|
The simplest approach: evaluate an expression that yields the value and convert it.
|
||||||
|
|||||||
@@ -0,0 +1,128 @@
|
|||||||
|
# Generics and type expressions
|
||||||
|
|
||||||
|
This document covers generics, bounds, unions/intersections, and the rules for type expressions in Lyng.
|
||||||
|
|
||||||
|
# Generic parameters
|
||||||
|
|
||||||
|
Declare type parameters with `<...>` on functions and classes:
|
||||||
|
|
||||||
|
fun id<T>(x: T): T = x
|
||||||
|
class Box<T>(val value: T)
|
||||||
|
|
||||||
|
Type arguments are usually inferred at call sites:
|
||||||
|
|
||||||
|
val b = Box(10) // Box<Int>
|
||||||
|
val s = id("ok") // T is String
|
||||||
|
|
||||||
|
# Bounds
|
||||||
|
|
||||||
|
Use `:` to set bounds. Bounds may be unions (`|`) or intersections (`&`):
|
||||||
|
|
||||||
|
fun sum<T: Int | Real>(x: T, y: T) = x + y
|
||||||
|
class Named<T: Iterable & Comparable>(val data: T)
|
||||||
|
|
||||||
|
Bounds are checked at compile time. For union bounds, the argument must fit at least one option. For intersection bounds, it must fit all options.
|
||||||
|
|
||||||
|
# Variance
|
||||||
|
|
||||||
|
Generic types are invariant by default. You can specify declaration-site variance:
|
||||||
|
|
||||||
|
class Source<out T>(val value: T)
|
||||||
|
class Sink<in T> { fun accept(x: T) { ... } }
|
||||||
|
|
||||||
|
`out` makes the type covariant (produced), `in` makes it contravariant (consumed).
|
||||||
|
|
||||||
|
# Type aliases
|
||||||
|
|
||||||
|
Type aliases name type expressions (including unions/intersections):
|
||||||
|
|
||||||
|
type Num = Int | Real
|
||||||
|
type AB = A & B
|
||||||
|
|
||||||
|
Aliases can be generic and can use bounds and defaults:
|
||||||
|
|
||||||
|
type Maybe<T> = T?
|
||||||
|
type IntList<T: Int> = List<T>
|
||||||
|
|
||||||
|
Aliases expand to their underlying type expressions. They can be used anywhere a type expression is expected.
|
||||||
|
|
||||||
|
# Inference rules
|
||||||
|
|
||||||
|
- Literals set obvious types (`1` is `Int`, `1.0` is `Real`, etc.).
|
||||||
|
- Empty list literals default to `List<Object>` unless constrained by context.
|
||||||
|
- Non-empty list literals infer element type as a union of element types.
|
||||||
|
- Map literals infer key and value types; named keys are `String`.
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
val a = [1, 2, 3] // List<Int>
|
||||||
|
val b = [1, "two", true] // List<Int | String | Bool>
|
||||||
|
val c: List<Int> = [] // List<Int>
|
||||||
|
|
||||||
|
val m1 = { "a": 1, "b": 2 } // Map<String, Int>
|
||||||
|
val m2 = { "a": 1, "b": "x" } // Map<String, Int | String>
|
||||||
|
val m3 = { ...m1, "c": true } // Map<String, Int | Bool>
|
||||||
|
|
||||||
|
Map spreads carry key/value types when possible.
|
||||||
|
|
||||||
|
Spreads propagate element type when possible:
|
||||||
|
|
||||||
|
val base = [1, 2]
|
||||||
|
val mix = [...base, 3] // List<Int>
|
||||||
|
|
||||||
|
# Type expressions
|
||||||
|
|
||||||
|
Type expressions include simple types, generics, unions, and intersections:
|
||||||
|
|
||||||
|
Int
|
||||||
|
List<String>
|
||||||
|
Int | String
|
||||||
|
Iterable & Comparable
|
||||||
|
|
||||||
|
These type expressions can appear in casts and `is` checks.
|
||||||
|
|
||||||
|
# `is`, `in`, and `==` with type expressions
|
||||||
|
|
||||||
|
There are two categories of `is` checks:
|
||||||
|
|
||||||
|
1) Value checks: `x is T`
|
||||||
|
- `x` is a value, `T` is a type expression.
|
||||||
|
- This is a runtime instance check.
|
||||||
|
|
||||||
|
2) Type checks: `T1 is T2`
|
||||||
|
- both sides are type expressions (class objects or unions/intersections).
|
||||||
|
- This is a *type-subset* check: every value of `T1` must fit in `T2`.
|
||||||
|
|
||||||
|
Exact type expression equality uses `==` and is structural (union/intersection order does not matter).
|
||||||
|
|
||||||
|
Includes checks use `in` with type expressions:
|
||||||
|
|
||||||
|
A in T
|
||||||
|
|
||||||
|
This means `A` is a subset of `T` (the same relation as `A is T`).
|
||||||
|
|
||||||
|
Examples (T = A | B):
|
||||||
|
|
||||||
|
T == A // false
|
||||||
|
T is A // false
|
||||||
|
A in T // true
|
||||||
|
B in T // true
|
||||||
|
T is A | B // true
|
||||||
|
|
||||||
|
# Practical examples
|
||||||
|
|
||||||
|
fun acceptInts<T: Int>(xs: List<T>) { }
|
||||||
|
acceptInts([1, 2, 3])
|
||||||
|
// acceptInts([1, "a"]) -> compile-time error
|
||||||
|
|
||||||
|
fun f<T>(list: List<T>) {
|
||||||
|
assert( T is Int | String | Bool )
|
||||||
|
assert( !(T is Int) )
|
||||||
|
assert( Int in T )
|
||||||
|
}
|
||||||
|
f([1, "two", true])
|
||||||
|
|
||||||
|
# Notes
|
||||||
|
|
||||||
|
- `T` is reified as a type expression when needed (e.g., union/intersection). When it is a single class, `T` is that class object.
|
||||||
|
- Type expression checks are compile-time where possible; runtime checks only happen for `is` on values and explicit casts.
|
||||||
@@ -20,7 +20,18 @@ Simple classes serialization is supported:
|
|||||||
assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
|
assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Note that mutable members are serialized:
|
Note that mutable members are serialized by default. You can exclude any member (including constructor parameters) from JSON serialization using the `@Transient` attribute:
|
||||||
|
|
||||||
|
import lyng.serialization
|
||||||
|
|
||||||
|
class Point2(@Transient val foo, val bar) {
|
||||||
|
@Transient var reason = 42
|
||||||
|
var visible = 100
|
||||||
|
}
|
||||||
|
assertEquals( "{\"bar\":2,\"visible\":100}", Point2(1,2).toJsonString() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Note that if you override json serialization:
|
||||||
|
|
||||||
import lyng.serialization
|
import lyng.serialization
|
||||||
|
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ or transformed `Real` otherwise.
|
|||||||
| pow(x, y) | ${x^y}$ |
|
| pow(x, y) | ${x^y}$ |
|
||||||
| sqrt(x) | $ \sqrt {x}$ |
|
| sqrt(x) | $ \sqrt {x}$ |
|
||||||
| abs(x) | absolute value of x. Int if x is Int, Real otherwise |
|
| abs(x) | absolute value of x. Int if x is Int, Real otherwise |
|
||||||
|
| clamp(x, range) | limit x to be inside range boundaries |
|
||||||
|
|
||||||
For example:
|
For example:
|
||||||
|
|
||||||
@@ -102,6 +103,11 @@ For example:
|
|||||||
// abs() keeps the argument type:
|
// abs() keeps the argument type:
|
||||||
assert( abs(-1) is Int)
|
assert( abs(-1) is Int)
|
||||||
assert( abs(-2.21) == 2.21 )
|
assert( abs(-2.21) == 2.21 )
|
||||||
|
|
||||||
|
// clamp() limits value to the range:
|
||||||
|
assert( clamp(15, 0..10) == 10 )
|
||||||
|
assert( clamp(-5, 0..10) == 0 )
|
||||||
|
assert( 5.clamp(0..10) == 5 )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
## Scientific constant
|
## Scientific constant
|
||||||
|
|||||||
+1
-1
@@ -33,7 +33,7 @@ PerfProfiles.restore(snap) // restore previous flags
|
|||||||
- `ARG_BUILDER` — Efficient argument building: small‑arity no‑alloc and pooled builder on JVM (ON JVM default).
|
- `ARG_BUILDER` — Efficient argument building: small‑arity no‑alloc and pooled builder on JVM (ON JVM default).
|
||||||
- `ARG_SMALL_ARITY_12` — Extends small‑arity no‑alloc call paths from 0–8 to 0–12 arguments (JVM‑first exploration; OFF by default). Use for codebases with many 9–12 arg calls; A/B before enabling.
|
- `ARG_SMALL_ARITY_12` — Extends small‑arity no‑alloc call paths from 0–8 to 0–12 arguments (JVM‑first exploration; OFF by default). Use for codebases with many 9–12 arg calls; A/B before enabling.
|
||||||
- `SKIP_ARGS_ON_NULL_RECEIVER` — Early return on optional‑null receivers before building args (semantics‑compatible). A/B only.
|
- `SKIP_ARGS_ON_NULL_RECEIVER` — Early return on optional‑null receivers before building args (semantics‑compatible). A/B only.
|
||||||
- `SCOPE_POOL` — Scope frame pooling for calls (JVM, per‑thread ThreadLocal pool). ON by default on JVM; togglable at runtime.
|
- `SCOPE_POOL` — Scope frame pooling for calls (per‑thread ThreadLocal pool on JVM/Android/Native; global deque on JS/Wasm). ON by default on all platforms; togglable at runtime.
|
||||||
- `FIELD_PIC` — 2‑entry polymorphic inline cache for field reads/writes keyed by `(classId, layoutVersion)` (ON JVM default).
|
- `FIELD_PIC` — 2‑entry polymorphic inline cache for field reads/writes keyed by `(classId, layoutVersion)` (ON JVM default).
|
||||||
- `METHOD_PIC` — 2‑entry PIC for instance method calls keyed by `(classId, layoutVersion)` (ON JVM default).
|
- `METHOD_PIC` — 2‑entry PIC for instance method calls keyed by `(classId, layoutVersion)` (ON JVM default).
|
||||||
- `FIELD_PIC_SIZE_4` — Increases Field PIC size from 2 to 4 entries (JVM-first tuning; OFF by default). Use for sites with >2 receiver shapes.
|
- `FIELD_PIC_SIZE_4` — Increases Field PIC size from 2 to 4 entries (JVM-first tuning; OFF by default). Use for sites with >2 receiver shapes.
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#!/bin/env lyng
|
#!/bin/env lyng
|
||||||
|
|
||||||
import lyng.io.fs
|
import lyng.io.fs
|
||||||
import lyng.stdlib
|
|
||||||
|
|
||||||
val files = Path("../..").list().toList()
|
val files = Path("../..").list().toList()
|
||||||
// most long is longest?
|
// most long is longest?
|
||||||
|
|||||||
@@ -4,15 +4,21 @@
|
|||||||
test the Lyng way. It is not meant to be effective.
|
test the Lyng way. It is not meant to be effective.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
fun naiveCountHappyNumbers() {
|
fun naiveCountHappyNumbers(): Int {
|
||||||
var count = 0
|
var count = 0
|
||||||
for( n1 in 0..9 )
|
for( n1 in 0..9 ) {
|
||||||
for( n2 in 0..9 )
|
for( n2 in 0..9 ) {
|
||||||
for( n3 in 0..9 )
|
for( n3 in 0..9 ) {
|
||||||
for( n4 in 0..9 )
|
for( n4 in 0..9 ) {
|
||||||
for( n5 in 0..9 )
|
for( n5 in 0..9 ) {
|
||||||
for( n6 in 0..9 )
|
for( n6 in 0..9 ) {
|
||||||
if( n1 + n2 + n3 == n4 + n5 + n6 ) count++
|
if( n1 + n2 + n3 == n4 + n5 + n6 ) count++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
count
|
count
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -28,4 +34,3 @@ for( r in 1..900 ) {
|
|||||||
assert( found == 55252 )
|
assert( found == 55252 )
|
||||||
delay(0.05)
|
delay(0.05)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1,5 +1,7 @@
|
|||||||
# Scopes and Closures: resolution and safety
|
# Scopes and Closures: resolution and safety
|
||||||
|
|
||||||
|
Attention to AI: name lookup is ibsolete and must not be used with bytecode compiler
|
||||||
|
|
||||||
This page documents how name resolution works with `ClosureScope`, how to avoid recursion pitfalls, and how to safely capture and execute callbacks that need access to outer locals.
|
This page documents how name resolution works with `ClosureScope`, how to avoid recursion pitfalls, and how to safely capture and execute callbacks that need access to outer locals.
|
||||||
|
|
||||||
## Why this matters
|
## Why this matters
|
||||||
|
|||||||
+25
-8
@@ -20,20 +20,37 @@ It is as simple as:
|
|||||||
assert( text.length > encodedBits.toBuffer().size )
|
assert( text.length > encodedBits.toBuffer().size )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Any class you create is serializable by default; lynon serializes first constructor fields, then any `var` member fields:
|
Any class you create is serializable by default; lynon serializes first constructor fields, then any `var` member fields.
|
||||||
|
|
||||||
import lyng.serialization
|
## Transient Fields
|
||||||
|
|
||||||
class Point(x,y)
|
Sometimes you have fields that should not be serialized, for example, temporary caches, secret data, or derived values that are recomputed in `init` blocks. You can mark such fields with the `@Transient` attribute:
|
||||||
|
|
||||||
val p = Lynon.decode( Lynon.encode( Point(5,6) ) )
|
```lyng
|
||||||
|
class MyData(@Transient val tempSecret, val publicData) {
|
||||||
|
@Transient var cachedValue = 0
|
||||||
|
var persistentValue = 42
|
||||||
|
|
||||||
assertEquals( 5, p.x )
|
init {
|
||||||
assertEquals( 6, p.y )
|
// cachedValue can be recomputed here upon deserialization
|
||||||
>>> void
|
cachedValue = computeCache(publicData)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Transient fields:
|
||||||
|
- Are **omitted** from Lynon binary streams.
|
||||||
|
- Are **omitted** from JSON output (via `toJson`).
|
||||||
|
- Are **ignored** during structural equality checks (`==`).
|
||||||
|
- If a transient constructor parameter has a **default value**, it will be restored to that default value during deserialization. Otherwise, it will be `null`.
|
||||||
|
- Class body fields marked as `@Transient` will keep their initial values (or values assigned in `init`) after deserialization.
|
||||||
|
|
||||||
just as expected.
|
## Serialization of Objects and Classes
|
||||||
|
|
||||||
|
- **Singleton Objects**: `object` declarations are serializable by name. Their state (mutable fields) is also serialized and restored, respecting `@Transient`.
|
||||||
|
- **Classes**: Class objects themselves can be serialized. They are serialized by their full qualified name. When converted to JSON, a class object includes its public static fields (excluding those marked `@Transient`).
|
||||||
|
|
||||||
|
## Custom Serialization
|
||||||
|
|
||||||
Important is to understand that normally `Lynon.decode` wants [BitBuffer], as `Lynon.encode` produces. If you have the regular [Buffer], be sure to convert it:
|
Important is to understand that normally `Lynon.decode` wants [BitBuffer], as `Lynon.encode` produces. If you have the regular [Buffer], be sure to convert it:
|
||||||
|
|
||||||
|
|||||||
+75
-136
@@ -2,166 +2,105 @@
|
|||||||
|
|
||||||
Lyng date and time support requires importing `lyng.time` packages. Lyng uses simple yet modern time object models:
|
Lyng date and time support requires importing `lyng.time` packages. Lyng uses simple yet modern time object models:
|
||||||
|
|
||||||
- `Instant` class for time stamps with platform-dependent resolution
|
- `Instant` class for absolute time stamps with platform-dependent resolution.
|
||||||
- `Duration` to represent amount of time not depending on the calendar, e.g. in absolute units (milliseconds, seconds,
|
- `DateTime` class for calendar-aware points in time within a specific time zone.
|
||||||
hours, days)
|
- `Duration` to represent amount of time not depending on the calendar (e.g., milliseconds, seconds).
|
||||||
|
|
||||||
## Time instant: `Instant`
|
## Time instant: `Instant`
|
||||||
|
|
||||||
Represent some moment of time not depending on the calendar (calendar for example may b e changed, daylight saving time
|
Represent some moment of time not depending on the calendar. It is similar to `TIMESTAMP` in SQL or `Instant` in Kotlin.
|
||||||
can be for example introduced or dropped). It is similar to `TIMESTAMP` in SQL or `Instant` in Kotlin. Some moment of
|
|
||||||
time; not the calendar date.
|
|
||||||
|
|
||||||
Instant is comparable to other Instant. Subtracting instants produce `Duration`, period in time that is not dependent on
|
### Constructing and converting
|
||||||
the calendar, e.g. absolute time period.
|
|
||||||
|
|
||||||
It is possible to add or subtract `Duration` to and from `Instant`, that gives another `Instant`.
|
|
||||||
|
|
||||||
Instants are converted to and from `Real` number of seconds before or after Unix Epoch, 01.01.1970. Constructor with
|
|
||||||
single number parameter constructs from such number of seconds,
|
|
||||||
and any instance provide `.epochSeconds` member:
|
|
||||||
|
|
||||||
import lyng.time
|
import lyng.time
|
||||||
|
|
||||||
// default constructor returns time now:
|
// default constructor returns time now:
|
||||||
val t1 = Instant()
|
val t1 = Instant()
|
||||||
val t2 = Instant()
|
|
||||||
assert( t2 - t1 < 1.millisecond )
|
|
||||||
assert( t2.epochSeconds - t1.epochSeconds < 0.001 )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## Constructing
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
|
|
||||||
// empty constructor gives current time instant using system clock:
|
|
||||||
val now = Instant()
|
|
||||||
|
|
||||||
// constructor with Instant instance makes a copy:
|
|
||||||
assertEquals( now, Instant(now) )
|
|
||||||
|
|
||||||
// constructing from a number is trated as seconds since unix epoch:
|
|
||||||
val copyOfNow = Instant( now.epochSeconds )
|
|
||||||
|
|
||||||
// note that instant resolution is higher that Real can hold
|
|
||||||
// so reconstructed from real slightly differs:
|
|
||||||
assert( abs( (copyOfNow - now).milliseconds ) < 0.01 )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
The resolution of system clock could be more precise and double precision real number of `Real`, keep it in mind.
|
|
||||||
|
|
||||||
## Comparing and calculating periods
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
|
|
||||||
val now = Instant()
|
// constructing from a number is treated as seconds since unix epoch:
|
||||||
|
val t2 = Instant(1704110400) // 2024-01-01T12:00:00Z
|
||||||
|
|
||||||
// you cam add or subtract periods, and compare
|
// from RFC3339 string:
|
||||||
assert( now - 5.minutes < now )
|
val t3 = Instant("2024-01-01T12:00:00.123456Z")
|
||||||
val oneHourAgo = now - 1.hour
|
|
||||||
assertEquals( now, oneHourAgo + 1.hour)
|
// truncation:
|
||||||
|
val t4 = t3.truncateToMinute
|
||||||
|
assertEquals(t4.toRFC3339(), "2024-01-01T12:00:00Z")
|
||||||
|
|
||||||
|
// to localized DateTime (uses system default TZ if not specified):
|
||||||
|
val dt = t3.toDateTime("+02:00")
|
||||||
|
assertEquals(dt.hour, 14)
|
||||||
|
|
||||||
>>> void
|
### Instant members
|
||||||
|
|
||||||
## Getting the max precision
|
|
||||||
|
|
||||||
Normally, subtracting instants gives precision to microseconds, which is well inside the jitter
|
|
||||||
the language VM adds. Still `Instant()` or `Instant.now()` capture most precise system timer at hand and provide inner
|
|
||||||
value of 12 bytes, up to nanoseconds (hopefully). To access it use:
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
|
|
||||||
// capture time
|
|
||||||
val now = Instant.now()
|
|
||||||
|
|
||||||
// this is Int value, number of whole epoch
|
|
||||||
// milliseconds to the moment, it fits 8 bytes Int well
|
|
||||||
val seconds = now.epochWholeSeconds
|
|
||||||
assert(seconds is Int)
|
|
||||||
|
|
||||||
// and this is Int value of nanoseconds _since_ the epochMillis,
|
|
||||||
// it effectively add 4 more mytes int:
|
|
||||||
val nanos = now.nanosecondsOfSecond
|
|
||||||
assert(nanos is Int)
|
|
||||||
assert( nanos in 0..999_999_999 )
|
|
||||||
|
|
||||||
// we can construct epochSeconds from these parts:
|
|
||||||
assertEquals( now.epochSeconds, nanos * 1e-9 + seconds )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## Truncating to more realistic precision
|
|
||||||
|
|
||||||
Full precision Instant is way too long and impractical to store, especially when serializing,
|
|
||||||
so it is possible to truncate it to milliseconds, microseconds or seconds:
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
import lyng.serialization
|
|
||||||
|
|
||||||
// max supported size (now microseconds for serialized value):
|
|
||||||
// note that encoding return _bit array_ and this is a _bit size_:
|
|
||||||
val s0 = Lynon.encode(Instant.now()).size
|
|
||||||
|
|
||||||
// shorter: milliseconds only
|
|
||||||
val s1 = Lynon.encode(Instant.now().truncateToMillisecond()).size
|
|
||||||
|
|
||||||
// truncated to seconds, good for file mtime, etc:
|
|
||||||
val s2 = Lynon.encode(Instant.now().truncateToSecond()).size
|
|
||||||
assert( s1 < s0 )
|
|
||||||
assert( s2 < s1 )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## Formatting instants
|
|
||||||
|
|
||||||
You can freely use `Instant` in string formatting. It supports usual sprintf-style formats:
|
|
||||||
|
|
||||||
import lyng.time
|
|
||||||
val now = Instant()
|
|
||||||
|
|
||||||
// will be something like "now: 12:10:05"
|
|
||||||
val currentTimeOnly24 = "now: %tT"(now)
|
|
||||||
|
|
||||||
// we can extract epoch second with formatting too,
|
|
||||||
// this was since early C time
|
|
||||||
|
|
||||||
// get epoch while seconds from formatting
|
|
||||||
val unixEpoch = "Now is %ts since unix epoch"(now)
|
|
||||||
|
|
||||||
// and it is the same as now.epochSeconds, int part:
|
|
||||||
assertEquals( unixEpoch, "Now is %d since unix epoch"(now.epochSeconds.toInt()) )
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
See
|
|
||||||
the [complete list of available formats](https://github.com/sergeych/mp_stools?tab=readme-ov-file#datetime-formatting)
|
|
||||||
and the [formatting reference](https://github.com/sergeych/mp_stools?tab=readme-ov-file#printf--sprintf): it all works
|
|
||||||
in Lyng as `"format"(args...)`!
|
|
||||||
|
|
||||||
## Instant members
|
|
||||||
|
|
||||||
| member | description |
|
| member | description |
|
||||||
|--------------------------------|---------------------------------------------------------|
|
|--------------------------------|---------------------------------------------------------|
|
||||||
| epochSeconds: Real | positive or negative offset in seconds since Unix epoch |
|
| epochSeconds: Real | positive or negative offset in seconds since Unix epoch |
|
||||||
| epochWholeSeconds: Int | same, but in _whole seconds_. Slightly faster |
|
| epochWholeSeconds: Int | same, but in _whole seconds_. Slightly faster |
|
||||||
| nanosecondsOfSecond: Int | offset from epochWholeSeconds in nanos (1) |
|
| nanosecondsOfSecond: Int | offset from epochWholeSeconds in nanos |
|
||||||
| isDistantFuture: Bool | true if it `Instant.distantFuture` |
|
| isDistantFuture: Bool | true if it `Instant.distantFuture` |
|
||||||
| isDistantPast: Bool | true if it `Instant.distantPast` |
|
| isDistantPast: Bool | true if it `Instant.distantPast` |
|
||||||
| truncateToSecond: Intant | create new instnce truncated to second |
|
| truncateToMinute: Instant | create new instance truncated to minute |
|
||||||
| truncateToMillisecond: Instant | truncate new instance with to millisecond |
|
| truncateToSecond: Instant | create new instance truncated to second |
|
||||||
|
| truncateToMillisecond: Instant | truncate new instance to millisecond |
|
||||||
| truncateToMicrosecond: Instant | truncate new instance to microsecond |
|
| truncateToMicrosecond: Instant | truncate new instance to microsecond |
|
||||||
|
| toRFC3339(): String | format as RFC3339 string (UTC) |
|
||||||
|
| toDateTime(tz?): DateTime | localize to a TimeZone (ID string or offset seconds) |
|
||||||
|
|
||||||
(1)
|
## Calendar time: `DateTime`
|
||||||
: The value of nanoseconds is to be added to `epochWholeSeconds` to get exact time point. It is in 0..999_999_999 range.
|
|
||||||
The precise time instant value therefore needs as for now 12 bytes integer; we might use bigint later (it is planned to
|
|
||||||
be added)
|
|
||||||
|
|
||||||
## Class members
|
`DateTime` represents a point in time in a specific timezone. It provides access to calendar components like year,
|
||||||
|
month, and day.
|
||||||
|
|
||||||
| member | description |
|
### Constructing
|
||||||
|--------------------------------|----------------------------------------------|
|
|
||||||
| Instant.now() | create new instance with current system time |
|
|
||||||
| Instant.distantPast: Instant | most distant instant in past |
|
|
||||||
| Instant.distantFuture: Instant | most distant instant in future |
|
|
||||||
|
|
||||||
# `Duraion` class
|
import lyng.time
|
||||||
|
|
||||||
|
// Current time in system default timezone
|
||||||
|
val now = DateTime.now()
|
||||||
|
|
||||||
|
// Specific timezone
|
||||||
|
val offsetTime = DateTime.now("+02:00")
|
||||||
|
|
||||||
|
// From Instant
|
||||||
|
val dt = Instant().toDateTime("Z")
|
||||||
|
|
||||||
|
// By components (year, month, day, hour=0, minute=0, second=0, timeZone="UTC")
|
||||||
|
val dt2 = DateTime(2024, 1, 1, 12, 0, 0, "Z")
|
||||||
|
|
||||||
|
// From RFC3339 string
|
||||||
|
val dt3 = DateTime.parseRFC3339("2024-01-01T12:00:00+02:00")
|
||||||
|
|
||||||
|
### DateTime members
|
||||||
|
|
||||||
|
| member | description |
|
||||||
|
|----------------------------------|-----------------------------------------------|
|
||||||
|
| year: Int | year component |
|
||||||
|
| month: Int | month component (1..12) |
|
||||||
|
| day: Int | day of month (alias `dayOfMonth`) |
|
||||||
|
| hour: Int | hour component (0..23) |
|
||||||
|
| minute: Int | minute component (0..59) |
|
||||||
|
| second: Int | second component (0..59) |
|
||||||
|
| dayOfWeek: Int | day of week (1=Monday, 7=Sunday) |
|
||||||
|
| timeZone: String | timezone ID string |
|
||||||
|
| toInstant(): Instant | convert back to absolute Instant |
|
||||||
|
| toUTC(): DateTime | shortcut to convert to UTC |
|
||||||
|
| toTimeZone(tz): DateTime | convert to another timezone |
|
||||||
|
| addMonths(n): DateTime | add/subtract months (normalizes end of month) |
|
||||||
|
| addYears(n): DateTime | add/subtract years |
|
||||||
|
| toRFC3339(): String | format with timezone offset |
|
||||||
|
| static now(tz?): DateTime | create DateTime with current time |
|
||||||
|
| static parseRFC3339(s): DateTime | parse RFC3339 string |
|
||||||
|
|
||||||
|
### Arithmetic and normalization
|
||||||
|
|
||||||
|
`DateTime` handles calendar arithmetic correctly:
|
||||||
|
|
||||||
|
val leapDay = Instant("2024-02-29T12:00:00Z").toDateTime("Z")
|
||||||
|
val nextYear = leapDay.addYears(1)
|
||||||
|
assertEquals(nextYear.day, 28) // Feb 29, 2024 -> Feb 28, 2025
|
||||||
|
|
||||||
|
# `Duration` class
|
||||||
|
|
||||||
Represent absolute time distance between two `Instant`.
|
Represent absolute time distance between two `Instant`.
|
||||||
|
|
||||||
|
|||||||
+178
-7
@@ -10,6 +10,7 @@ __Other documents to read__ maybe after this one:
|
|||||||
- [OOP notes](OOP.md), [exception handling](exceptions_handling.md)
|
- [OOP notes](OOP.md), [exception handling](exceptions_handling.md)
|
||||||
- [math in Lyng](math.md), [the `when` statement](when.md), [return statement](return_statement.md)
|
- [math in Lyng](math.md), [the `when` statement](when.md), [return statement](return_statement.md)
|
||||||
- [Testing and Assertions](Testing.md)
|
- [Testing and Assertions](Testing.md)
|
||||||
|
- [Generics and type expressions](generics.md)
|
||||||
- [time](time.md) and [parallelism](parallelism.md)
|
- [time](time.md) and [parallelism](parallelism.md)
|
||||||
- [parallelism] - multithreaded code, coroutines, etc.
|
- [parallelism] - multithreaded code, coroutines, etc.
|
||||||
- Some class
|
- Some class
|
||||||
@@ -106,6 +107,23 @@ Singleton objects are declared using the `object` keyword. They define a class a
|
|||||||
|
|
||||||
Logger.log("Hello singleton!")
|
Logger.log("Hello singleton!")
|
||||||
|
|
||||||
|
## Nested Declarations (short)
|
||||||
|
|
||||||
|
Classes, objects, and enums can be declared inside another class. They live in the class namespace (no outer instance capture), so you access them with a qualifier:
|
||||||
|
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
|
||||||
|
See [OOP notes](OOP.md#nested-declarations) for rules, visibility, and enum lifting details.
|
||||||
|
|
||||||
## Delegation (briefly)
|
## Delegation (briefly)
|
||||||
|
|
||||||
You can delegate properties and functions to other objects using the `by` keyword. This is perfect for patterns like `lazy` initialization.
|
You can delegate properties and functions to other objects using the `by` keyword. This is perfect for patterns like `lazy` initialization.
|
||||||
@@ -224,6 +242,9 @@ This also prevents chain assignments so use parentheses:
|
|||||||
|
|
||||||
## Nullability
|
## Nullability
|
||||||
|
|
||||||
|
Nullability is part of the type. `String` is non-null, `String?` is nullable. Use `!!` to assert non-null and throw
|
||||||
|
`NullReferenceException` if the value is `null`.
|
||||||
|
|
||||||
When the value is `null`, it might throws `NullReferenceException`, the name is somewhat a tradition. To avoid it
|
When the value is `null`, it might throws `NullReferenceException`, the name is somewhat a tradition. To avoid it
|
||||||
one can check it against null or use _null coalescing_. The null coalescing means, if the operand (left) is null,
|
one can check it against null or use _null coalescing_. The null coalescing means, if the operand (left) is null,
|
||||||
the operation won't be performed and the result will be null. Here is the difference:
|
the operation won't be performed and the result will be null. Here is the difference:
|
||||||
@@ -242,6 +263,9 @@ the operation won't be performed and the result will be null. Here is the differ
|
|||||||
assert( ref?() == null )
|
assert( ref?() == null )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
|
Note: `?.` is still a typed operation. The receiver must have a compile-time type that declares the member; if the
|
||||||
|
receiver is `Object`, cast it first or declare a more specific type.
|
||||||
|
|
||||||
There is also "elvis operator", null-coalesce infix operator '?:' that returns rvalue if lvalue is `null`:
|
There is also "elvis operator", null-coalesce infix operator '?:' that returns rvalue if lvalue is `null`:
|
||||||
|
|
||||||
null ?: "nothing"
|
null ?: "nothing"
|
||||||
@@ -425,8 +449,6 @@ Almost the same, using `val`:
|
|||||||
val foo = 1
|
val foo = 1
|
||||||
foo += 1 // this will throw exception
|
foo += 1 // this will throw exception
|
||||||
|
|
||||||
# Constants
|
|
||||||
|
|
||||||
Same as in kotlin:
|
Same as in kotlin:
|
||||||
|
|
||||||
val HalfPi = π / 2
|
val HalfPi = π / 2
|
||||||
@@ -434,6 +456,144 @@ Same as in kotlin:
|
|||||||
Note using greek characters in identifiers! All letters allowed, but remember who might try to read your script, most
|
Note using greek characters in identifiers! All letters allowed, but remember who might try to read your script, most
|
||||||
likely will know some English, the rest is the pure uncertainty.
|
likely will know some English, the rest is the pure uncertainty.
|
||||||
|
|
||||||
|
# Types and inference
|
||||||
|
|
||||||
|
Lyng uses Kotlin-style static types with inference. You can always write explicit types, but in most places the compiler
|
||||||
|
can infer them from literals, defaults, and flow analysis.
|
||||||
|
|
||||||
|
## Type annotations
|
||||||
|
|
||||||
|
Use `:` to specify a type:
|
||||||
|
|
||||||
|
var x: Int = 10
|
||||||
|
val label: String = "count"
|
||||||
|
fun clamp(x: Int, min: Int, max: Int): Int { ... }
|
||||||
|
|
||||||
|
`Object` is the top type. If you omit a type and there is no default value, the parameter is `Object` by default:
|
||||||
|
|
||||||
|
fun show(x) { println(x) } // x is Object
|
||||||
|
|
||||||
|
For nullable types, add `?`:
|
||||||
|
|
||||||
|
fun showMaybe(x: Object?) { ... }
|
||||||
|
fun parseInt(s: String?): Int? { ... }
|
||||||
|
|
||||||
|
There is also a nullable shorthand for untyped parameters and constructor args: `x?` means `x: Object?`.
|
||||||
|
It cannot be combined with an explicit type annotation.
|
||||||
|
|
||||||
|
class A(x?) { ... } // x: Object?
|
||||||
|
fun f(x?) { x == null } // x: Object?
|
||||||
|
|
||||||
|
Type aliases name type expressions and can be generic:
|
||||||
|
|
||||||
|
type Num = Int | Real
|
||||||
|
type Maybe<T> = T?
|
||||||
|
|
||||||
|
Aliases expand to their underlying type expressions. See `docs/generics.md` for details.
|
||||||
|
|
||||||
|
`void` is a singleton value of the class `Void`. `Void` can be used as an explicit return type:
|
||||||
|
|
||||||
|
fun log(msg): Void { println(msg); void }
|
||||||
|
|
||||||
|
`Null` is the class of `null`. It is a singleton type and mostly useful for type inference results.
|
||||||
|
|
||||||
|
## Type inference
|
||||||
|
|
||||||
|
The compiler infers types from:
|
||||||
|
|
||||||
|
- literals: `1` is `Int`, `1.0` is `Real`, `"s"` is `String`, `'c'` is `Char`
|
||||||
|
- defaults: `fun f(x=1, name="n")` infers `x: Int`, `name: String`
|
||||||
|
- assignments: `val x = call()` uses the return type of `call`
|
||||||
|
- returns and branches: the result type of a block is the last expression, and if any branch is nullable,
|
||||||
|
the inferred type becomes nullable
|
||||||
|
- numeric ops: `Int` and `Real` stay `Int` when both sides are `Int`, and promote to `Real` on mixed arithmetic
|
||||||
|
|
||||||
|
Examples:
|
||||||
|
|
||||||
|
fun inc(x=0) = x + 1 // (Int)->Int
|
||||||
|
fun maybe(flag) { if(flag) 1 else null } // ()->Int?
|
||||||
|
|
||||||
|
Untyped locals are allowed, but their type is fixed on the first assignment:
|
||||||
|
|
||||||
|
var x
|
||||||
|
x = 1 // x becomes Int
|
||||||
|
x = "one" // compile-time error
|
||||||
|
|
||||||
|
var y = null // y is Object?
|
||||||
|
val z = null // z is Null
|
||||||
|
|
||||||
|
Empty list/map literals default to `List<Object>` and `Map<Object,Object>` until a more specific type is known:
|
||||||
|
|
||||||
|
val xs = [] // List<Object>
|
||||||
|
val ys: List<Int> = [] // List<Int>
|
||||||
|
|
||||||
|
Map literals infer key/value types from entries; named keys are `String`. See `docs/generics.md` for details.
|
||||||
|
|
||||||
|
## Flow analysis
|
||||||
|
|
||||||
|
Lyng uses flow analysis to narrow types inside branches:
|
||||||
|
|
||||||
|
fun len(x: String?): Int {
|
||||||
|
if( x == null ) return 0
|
||||||
|
// x is String (non-null) in this branch
|
||||||
|
return x.length
|
||||||
|
}
|
||||||
|
|
||||||
|
`is` checks and `when` branches also narrow types:
|
||||||
|
|
||||||
|
fun kind(x: Object) {
|
||||||
|
if( x is Int ) return "int"
|
||||||
|
if( x is String ) return "string"
|
||||||
|
return "other"
|
||||||
|
}
|
||||||
|
|
||||||
|
Narrowing is local to the branch; after the branch, the original type is restored.
|
||||||
|
|
||||||
|
## Casts and unknown types
|
||||||
|
|
||||||
|
Use `as` for explicit casts. The compiler inserts casts only when it can be valid and necessary. If a cast fails at
|
||||||
|
runtime, it throws `ClassCastException`. If the value is nullable, `as T` implies a non-null assertion.
|
||||||
|
|
||||||
|
Member access is resolved at compile time. Only members of `Object` are available on unknown types; non-Object members
|
||||||
|
require an explicit cast:
|
||||||
|
|
||||||
|
fun f(x) { // x is Object
|
||||||
|
x.toString() // ok (Object member)
|
||||||
|
x.size() // compile-time error
|
||||||
|
(x as List).size() // ok
|
||||||
|
}
|
||||||
|
|
||||||
|
This avoids runtime name-resolution fallbacks; all symbols must be known at compile time.
|
||||||
|
|
||||||
|
## Generics and bounds
|
||||||
|
|
||||||
|
Generic parameters are declared with `<...>`:
|
||||||
|
|
||||||
|
fun id<T>(x: T): T = x
|
||||||
|
class Box<T>(val value: T)
|
||||||
|
|
||||||
|
Bounds use `:` and can combine with `&` (intersection) and `|` (union):
|
||||||
|
|
||||||
|
fun sum<T: Int | Real>(x: T, y: T) = x + y
|
||||||
|
class Named<T: Iterable & Comparable>(val data: T)
|
||||||
|
|
||||||
|
Type arguments are usually inferred from call sites:
|
||||||
|
|
||||||
|
val b = Box(10) // Box<Int>
|
||||||
|
val s = id("ok") // T is String
|
||||||
|
|
||||||
|
See [Generics and type expressions](generics.md) for bounds, unions/intersections, and type-checking rules.
|
||||||
|
|
||||||
|
## Variance
|
||||||
|
|
||||||
|
Generic types are invariant by default, so `List<Int>` is not a `List<Object>`.
|
||||||
|
Use declaration-site variance when you need it:
|
||||||
|
|
||||||
|
class Source<out T>(val value: T)
|
||||||
|
class Sink<in T> { fun accept(x: T) { ... } }
|
||||||
|
|
||||||
|
`out` makes the type covariant (only produced), `in` makes it contravariant (only consumed).
|
||||||
|
|
||||||
# Defining functions
|
# Defining functions
|
||||||
|
|
||||||
fun check(amount) {
|
fun check(amount) {
|
||||||
@@ -579,6 +739,7 @@ See also: [Testing and Assertions](Testing.md)
|
|||||||
var result = []
|
var result = []
|
||||||
for( x in iterable ) result += transform(x)
|
for( x in iterable ) result += transform(x)
|
||||||
}
|
}
|
||||||
|
// loop variables are read-only inside the loop body
|
||||||
assert( [11, 21, 31] == mapValues( [1,2,3], { it*10+1 }))
|
assert( [11, 21, 31] == mapValues( [1,2,3], { it*10+1 }))
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
@@ -1252,7 +1413,7 @@ The same with `--`:
|
|||||||
sum
|
sum
|
||||||
>>> 5050
|
>>> 5050
|
||||||
|
|
||||||
There are self-assigning version for operators too:
|
There is a self-assigning version for operators too:
|
||||||
|
|
||||||
var count = 100
|
var count = 100
|
||||||
var sum = 0
|
var sum = 0
|
||||||
@@ -1330,7 +1491,7 @@ than enum arrays, until `Lynon.encodeTyped` will be implemented.
|
|||||||
var result = null // here we will store the result
|
var result = null // here we will store the result
|
||||||
>>> null
|
>>> null
|
||||||
|
|
||||||
# Integral data types
|
# Built-in types
|
||||||
|
|
||||||
| type | description | literal samples |
|
| type | description | literal samples |
|
||||||
|--------|---------------------------------|---------------------|
|
|--------|---------------------------------|---------------------|
|
||||||
@@ -1340,6 +1501,7 @@ than enum arrays, until `Lynon.encodeTyped` will be implemented.
|
|||||||
| Char | single unicode character | `'S'`, `'\n'` |
|
| Char | single unicode character | `'S'`, `'\n'` |
|
||||||
| String | unicode string, no limits | "hello" (see below) |
|
| String | unicode string, no limits | "hello" (see below) |
|
||||||
| List | mutable list | [1, "two", 3] |
|
| List | mutable list | [1, "two", 3] |
|
||||||
|
| Object | top type for all values | |
|
||||||
| Void | no value could exist, singleton | void |
|
| Void | no value could exist, singleton | void |
|
||||||
| Null | missing value, singleton | null |
|
| Null | missing value, singleton | null |
|
||||||
| Fn | callable type | |
|
| Fn | callable type | |
|
||||||
@@ -1471,13 +1633,22 @@ Part match:
|
|||||||
assert( "foo" == $~.value )
|
assert( "foo" == $~.value )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Typical set of String functions includes:
|
Repeating the fragment:
|
||||||
|
|
||||||
|
assertEquals("hellohello", "hello"*2)
|
||||||
|
assertEquals("", "hello"*0)
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
A typical set of String functions includes:
|
||||||
|
|
||||||
| fun/prop | description / notes |
|
| fun/prop | description / notes |
|
||||||
|----------------------|------------------------------------------------------------|
|
|----------------------|------------------------------------------------------------|
|
||||||
| lower(), lowercase() | change case to unicode upper |
|
| lower(), lowercase() | change case to unicode upper |
|
||||||
| upper(), uppercase() | change case to unicode lower |
|
| upper(), uppercase() | change case to unicode lower |
|
||||||
| trim() | trim space chars from both ends |
|
| trim() | trim space chars from both ends |
|
||||||
|
| isEmpty() | true if string is empty |
|
||||||
|
| isNotEmpty() | true if string is not empty |
|
||||||
|
| isBlank() | true if empty or contains only whitespace |
|
||||||
| startsWith(prefix) | true if starts with a prefix |
|
| startsWith(prefix) | true if starts with a prefix |
|
||||||
| endsWith(prefix) | true if ends with a prefix |
|
| endsWith(prefix) | true if ends with a prefix |
|
||||||
| last() | get last character of a string or throw |
|
| last() | get last character of a string or throw |
|
||||||
@@ -1695,7 +1866,7 @@ assertEquals(null, (buzz as? Foo)?.runA())
|
|||||||
|
|
||||||
Notes:
|
Notes:
|
||||||
- Resolution order uses C3 MRO (active): deterministic, monotonic order suitable for diamonds and complex hierarchies. Example: for `class D() : B(), C()` where both `B()` and `C()` derive from `A()`, the C3 order is `D → B → C → A`. The first visible match wins.
|
- Resolution order uses C3 MRO (active): deterministic, monotonic order suitable for diamonds and complex hierarchies. Example: for `class D() : B(), C()` where both `B()` and `C()` derive from `A()`, the C3 order is `D → B → C → A`. The first visible match wins.
|
||||||
- `private` is visible only inside the declaring class; `protected` is visible from the declaring class and any of its transitive subclasses. Qualialsofication (`this@Type`) or casts do not bypass visibility.
|
- `private` is visible only inside the declaring class; `protected` is visible from the declaring class and its subclasses. Additionally, ancestors can access protected members of descendants if they override a member known to the ancestor. Qualification (`this@Type`) or casts do not bypass visibility.
|
||||||
- Safe‑call `?.` works with `as?` for optional dispatch.
|
- Safe‑call `?.` works with `as?` for optional dispatch.
|
||||||
|
|
||||||
## Extension members
|
## Extension members
|
||||||
@@ -1722,4 +1893,4 @@ Example with custom accessors:
|
|||||||
|
|
||||||
Extension members are **scope-isolated**: they are visible only in the scope where they are defined and its children. This prevents name collisions and improves security.
|
Extension members are **scope-isolated**: they are visible only in the scope where they are defined and its children. This prevents name collisions and improves security.
|
||||||
|
|
||||||
To get details on OOP in Lyng, see [OOP notes](OOP.md).
|
To get details on OOP in Lyng, see [OOP notes](OOP.md).
|
||||||
@@ -0,0 +1,27 @@
|
|||||||
|
# Wasm generation hang in wasmJs browser tests
|
||||||
|
|
||||||
|
## Summary
|
||||||
|
The wasmJs browser test runner hung after commit 5f819dc. The root cause was invalid WebAssembly generated by the Kotlin/Wasm backend when certain compiler paths emitted suspend lambdas for `Statement` execution. The invalid module failed to instantiate in the browser, and Karma kept the browser connected but never ran tests.
|
||||||
|
|
||||||
|
## Symptoms
|
||||||
|
- `:lynglib:wasmJsBrowserTest` hangs indefinitely in ChromeHeadless.
|
||||||
|
- `:lynglib:wasmJsNodeTest` fails with a WebAssembly compile error similar to:
|
||||||
|
- `struct.set expected type (ref null XXXX), found global.get of type (ref null YYYY)`
|
||||||
|
- The failing function name in the wasm name section looks like:
|
||||||
|
- `net.sergeych.lyng.$invokeCOROUTINE$.doResume`
|
||||||
|
|
||||||
|
## Root cause
|
||||||
|
The delegation/var-declaration changes introduced compiler-generated suspend lambdas inside `Statement` construction (e.g., `statement { ... }` wrappers). Kotlin/Wasm generates extra coroutine state for those suspend lambdas, which in this case produced invalid wasm IR (mismatched GC reference types). The browser loader then waits forever because the module fails to instantiate.
|
||||||
|
|
||||||
|
## Fix
|
||||||
|
Avoid suspend-lambda `Statement` construction in compiler code paths. Replace `statement { ... }` and other anonymous suspend lambdas with explicit `object : Statement()` implementations and move logic into `override suspend fun execute(...)`. This keeps the resulting wasm IR valid while preserving behavior.
|
||||||
|
|
||||||
|
## Where it was fixed
|
||||||
|
- `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt`
|
||||||
|
- `lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt`
|
||||||
|
|
||||||
|
## Verification
|
||||||
|
- `./gradlew :lynglib:wasmJsNodeTest --info`
|
||||||
|
- `./gradlew :lynglib:wasmJsBrowserTest --info`
|
||||||
|
|
||||||
|
Both tests finish quickly after the change.
|
||||||
+66
-1
@@ -1,6 +1,7 @@
|
|||||||
# What's New in Lyng
|
# What's New in Lyng
|
||||||
|
|
||||||
This document highlights the latest additions and improvements to the Lyng language and its ecosystem.
|
This document highlights the latest additions and improvements to the Lyng language and its ecosystem.
|
||||||
|
For a programmer-focused migration summary, see `docs/whats_new_1_5.md`.
|
||||||
|
|
||||||
## Language Features
|
## Language Features
|
||||||
|
|
||||||
@@ -24,6 +25,9 @@ class Person(private var _age: Int) {
|
|||||||
### Private and Protected Setters
|
### Private and Protected Setters
|
||||||
You can now restrict the visibility of a property's or field's setter using `private set` or `protected set`. This allows members to be publicly readable but only writable from within the declaring class or its subclasses.
|
You can now restrict the visibility of a property's or field's setter using `private set` or `protected set`. This allows members to be publicly readable but only writable from within the declaring class or its subclasses.
|
||||||
|
|
||||||
|
### Refined Protected Visibility
|
||||||
|
Ancestor classes can now access `protected` members of their descendants if it is an override of a member known to the ancestor. This enables base classes to call protected methods that are implemented or overridden in subclasses.
|
||||||
|
|
||||||
```lyng
|
```lyng
|
||||||
class Counter {
|
class Counter {
|
||||||
var count = 0
|
var count = 0
|
||||||
@@ -98,13 +102,31 @@ Singleton objects are declared using the `object` keyword. They provide a conven
|
|||||||
|
|
||||||
```lyng
|
```lyng
|
||||||
object Config {
|
object Config {
|
||||||
val version = "1.2.3"
|
val version = "1.5.0-SNAPSHOT"
|
||||||
fun show() = println("Config version: " + version)
|
fun show() = println("Config version: " + version)
|
||||||
}
|
}
|
||||||
|
|
||||||
Config.show()
|
Config.show()
|
||||||
```
|
```
|
||||||
|
|
||||||
|
### Nested Declarations and Lifted Enums
|
||||||
|
You can now declare classes, objects, enums, and type aliases inside another class. These nested declarations live in the class namespace (no outer instance capture) and are accessed with a qualifier.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val ab = A.B()
|
||||||
|
assertEquals(ab.x, null)
|
||||||
|
assertEquals(A.Inner.foo, "bar")
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
```
|
||||||
|
|
||||||
|
The `*` on `enum E*` lifts entries into the enclosing class namespace (compile-time error on ambiguity).
|
||||||
|
|
||||||
### Object Expressions
|
### Object Expressions
|
||||||
You can now create anonymous objects that inherit from classes or interfaces using the `object : Base { ... }` syntax. These expressions capture their lexical scope and support multiple inheritance.
|
You can now create anonymous objects that inherit from classes or interfaces using the `object : Base { ... }` syntax. These expressions capture their lexical scope and support multiple inheritance.
|
||||||
|
|
||||||
@@ -168,6 +190,41 @@ settings["theme"] ?= "dark"
|
|||||||
|
|
||||||
The operator returns the final value of the receiver (the original value if it was not `null`, or the new value if the assignment occurred).
|
The operator returns the final value of the receiver (the original value if it was not `null`, or the new value if the assignment occurred).
|
||||||
|
|
||||||
|
### Transient Attribute (`@Transient`)
|
||||||
|
The `@Transient` attribute can now be applied to class fields, constructor parameters, and static fields to exclude them from serialization.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class MyData(@Transient val tempSecret, val publicData) {
|
||||||
|
@Transient var cachedValue = 0
|
||||||
|
var persistentValue = 42
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Key features:
|
||||||
|
- **Serialization**: Transient members are omitted from both Lynon binary streams and JSON output.
|
||||||
|
- **Structural Equality**: Transient fields are automatically ignored during `==` equality checks.
|
||||||
|
- **Deserialization**: Transient constructor parameters with default values are correctly restored to those defaults upon restoration.
|
||||||
|
|
||||||
|
### Value Clamping (`clamp`)
|
||||||
|
A new `clamp()` function has been added to the standard library to limit a value within a specified range. It is available as both a global function and an extension method on all objects.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
// Global function
|
||||||
|
clamp(15, 0..10) // returns 10
|
||||||
|
clamp(-5, 0..10) // returns 0
|
||||||
|
|
||||||
|
// Extension method
|
||||||
|
val x = 15
|
||||||
|
x.clamp(0..10) // returns 10
|
||||||
|
|
||||||
|
// Exclusive and open-ended ranges
|
||||||
|
15.clamp(0..<10) // returns 9
|
||||||
|
15.clamp(..10) // returns 10
|
||||||
|
-5.clamp(0..) // returns 0
|
||||||
|
```
|
||||||
|
|
||||||
|
`clamp()` correctly handles inclusive (`..`) and exclusive (`..<`) ranges. For discrete types like `Int` and `Char`, clamping to an exclusive upper bound returns the previous value.
|
||||||
|
|
||||||
## Tooling and Infrastructure
|
## Tooling and Infrastructure
|
||||||
|
|
||||||
### CLI: Formatting Command
|
### CLI: Formatting Command
|
||||||
@@ -186,3 +243,11 @@ You can enable it in **Settings | Lyng Formatter | Enable Lyng autocompletion**.
|
|||||||
|
|
||||||
### Kotlin API: Exception Handling
|
### Kotlin API: Exception Handling
|
||||||
The `Obj.getLyngExceptionMessageWithStackTrace()` extension method has been added to simplify retrieving detailed error information from Lyng exception objects in Kotlin. Additionally, `getLyngExceptionMessage()` and `raiseAsExecutionError()` now accept an optional `Scope`, making it easier to use them when a scope is not immediately available.
|
The `Obj.getLyngExceptionMessageWithStackTrace()` extension method has been added to simplify retrieving detailed error information from Lyng exception objects in Kotlin. Additionally, `getLyngExceptionMessage()` and `raiseAsExecutionError()` now accept an optional `Scope`, making it easier to use them when a scope is not immediately available.
|
||||||
|
|
||||||
|
### Kotlin API: Bridge Reflection and Class Binding (Preferred Extensions)
|
||||||
|
Lyng now provides a public Kotlin reflection bridge and a Lyng‑first class binding workflow. This is the **preferred** way to write Kotlin extensions and library integrations:
|
||||||
|
|
||||||
|
- **Bridge resolver**: explicit handles for values, vars, and callables with predictable lookup rules.
|
||||||
|
- **Class bridge binding**: declare classes/members in Lyng (marked `extern`) and bind the implementations in Kotlin before the first instance is created.
|
||||||
|
|
||||||
|
See **Embedding Lyng** for full samples and usage details.
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
# What's New in Lyng 1.3 (vs 1.2.* / master)
|
||||||
|
|
||||||
|
This is a programmer-focused summary of what changed since the 1.2.* line on `master`. It highlights new language and type-system features, runtime/IDE improvements, and how to migrate code safely.
|
||||||
|
|
||||||
|
## Highlights
|
||||||
|
|
||||||
|
- Generics are now a first-class part of the type system, with bounds, variance, unions, and intersections.
|
||||||
|
- Type aliases and type-expression checks (`T1 is T2`, `A in T`) enable richer static modeling.
|
||||||
|
- Nested declarations inside classes, plus lifted enum entries via `enum E*`.
|
||||||
|
- Stepped ranges (`step`) including iterable open-ended and real ranges.
|
||||||
|
- Runtime and compiler speedups: more bytecode coverage, direct slot access, call-site caching.
|
||||||
|
|
||||||
|
## Language and type system
|
||||||
|
|
||||||
|
### Generics, bounds, and variance
|
||||||
|
|
||||||
|
You can declare generic functions/classes with `<...>`, restrict them with bounds, and control variance.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun id<T>(x: T): T = x
|
||||||
|
class Box<out T>(val value: T)
|
||||||
|
|
||||||
|
fun sum<T: Int | Real>(x: T, y: T) = x + y
|
||||||
|
class Named<T: Iterable & Comparable>(val data: T)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Type aliases and type expressions
|
||||||
|
|
||||||
|
Type aliases can name any type expression, including unions and intersections.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
type Num = Int | Real
|
||||||
|
type Maybe<T> = T?
|
||||||
|
```
|
||||||
|
|
||||||
|
Type expressions can be checked directly:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun f<T>(xs: List<T>) {
|
||||||
|
assert( T is Int | String | Bool ) // type-subset check
|
||||||
|
assert( Int in T ) // same relation as `Int is T`
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
Value checks remain `x is T`. Type expression equality uses `==` and is structural.
|
||||||
|
|
||||||
|
### Nullable shorthand for parameters
|
||||||
|
|
||||||
|
Untyped parameters and constructor args can use `x?` as shorthand for `x: Object?`:
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A(x?) { ... }
|
||||||
|
fun f(x?) { x == null }
|
||||||
|
```
|
||||||
|
|
||||||
|
### List/map literal inference
|
||||||
|
|
||||||
|
The compiler now infers element and key/value types from literals and spreads. Mixed element types produce unions.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
val a = [1, 2, 3] // List<Int>
|
||||||
|
val b = [1, "two", true] // List<Int | String | Bool>
|
||||||
|
val m = { "a": 1, "b": "x" } // Map<String, Int | String>
|
||||||
|
```
|
||||||
|
|
||||||
|
### Compile-time member access only
|
||||||
|
|
||||||
|
Member access is resolved at compile time. On unknown types, only `Object` members are visible; other members require an explicit cast.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun f(x) { // x: Object
|
||||||
|
x.toString() // ok
|
||||||
|
x.size() // compile-time error
|
||||||
|
(x as List).size()
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
This removes runtime name-resolution fallbacks and makes errors deterministic.
|
||||||
|
|
||||||
|
### Nested declarations and lifted enums
|
||||||
|
|
||||||
|
Classes, objects, enums, and type aliases can be declared inside another class and accessed by qualifier. Enums can lift entries into the outer namespace with `*`.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class A {
|
||||||
|
class B(x?)
|
||||||
|
object Inner { val foo = "bar" }
|
||||||
|
type Alias = B
|
||||||
|
enum E* { One, Two }
|
||||||
|
}
|
||||||
|
|
||||||
|
val b = A.B()
|
||||||
|
assertEquals(A.One, A.E.One)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Stepped ranges
|
||||||
|
|
||||||
|
Ranges now support `step`, and open-ended/real ranges are iterable only with an explicit step.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
(1..5 step 2).toList() // [1,3,5]
|
||||||
|
(0.0..1.0 step 0.25).toList() // [0,0.25,0.5,0.75,1.0]
|
||||||
|
(0.. step 1).take(3).toList() // [0,1,2]
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tooling and performance
|
||||||
|
|
||||||
|
- Bytecode compiler/VM coverage expanded (loops, expressions, calls), improving execution speed and consistency.
|
||||||
|
- Direct frame-slot access and scoped slot addressing reduce lookup overhead, including in closures.
|
||||||
|
- Call-site caching and numeric fast paths reduce hot-loop overhead.
|
||||||
|
- IDE tooling updated for the new type system and nested declarations; MiniAst-based completion work continues.
|
||||||
|
|
||||||
|
## Migration guide (from 1.2.*)
|
||||||
|
|
||||||
|
1) Replace dynamic member access on unknown types
|
||||||
|
- If you relied on runtime name resolution, add explicit casts or annotate types so the compiler can resolve members.
|
||||||
|
|
||||||
|
2) Adopt new type-system constructs where helpful
|
||||||
|
- Consider `type` aliases for complex unions/intersections.
|
||||||
|
- Prefer generic signatures over `Object` when the API is parametric.
|
||||||
|
|
||||||
|
3) Update range iteration where needed
|
||||||
|
- Use `step` for open-ended or real ranges you want to iterate.
|
||||||
|
|
||||||
|
4) Nullable shorthand is optional
|
||||||
|
- If you used untyped nullable params, you can keep `x` (Object) or switch to `x?` (Object?) for clarity.
|
||||||
|
|
||||||
|
## References
|
||||||
|
|
||||||
|
- `docs/generics.md`
|
||||||
|
- `docs/Range.md`
|
||||||
|
- `docs/OOP.md`
|
||||||
|
- `docs/BytecodeSpec.md`
|
||||||
@@ -0,0 +1,140 @@
|
|||||||
|
# What's New in Lyng 1.5 (vs 1.3.* / master)
|
||||||
|
|
||||||
|
This document summarizes the significant changes and new features introduced in the 1.5 development cycle.
|
||||||
|
|
||||||
|
## Principal changes
|
||||||
|
|
||||||
|
### JIT compiler and compile-time types and symbols.
|
||||||
|
|
||||||
|
This major improvement gives the following big advantages:
|
||||||
|
|
||||||
|
- **Blazing Fast execution**: several times faster! (three to six times speedup in different scenarios).
|
||||||
|
- **Better IDE support**: autocompletion, early error detection, types check.
|
||||||
|
- **Error safety**: all symbols and types are checked at bound at compile-time. Many errors are detected earlier. Also, no risk that external or caller code would shadow some internally used symbols (especially in closures and inheritance).
|
||||||
|
|
||||||
|
In particular, it means no slow and flaky runtime lookups. Once compiled, code guarantees that it will always call the symbol known at compile-time; runtime name lookup though does not guarantee it and can be source of hard to trace bugs.
|
||||||
|
|
||||||
|
### New stable API to create Kotlin extensions
|
||||||
|
|
||||||
|
The API is fixed and will be kept with further Lyng core changes. It is now the recommended way to write Lyng extensions in Kotlin. It is much simpler and more elegant than the internal one. See [Kotlin Bridge Binding](../notes/kotlin_bridge_binding.md).
|
||||||
|
|
||||||
|
### Smart types system
|
||||||
|
|
||||||
|
- **Deep inference**: The compiler analyzes types of symbols along the execution path and in many cases eliminates unnecessary casts or type specifications.
|
||||||
|
- **Union and intersection types**: `A & B`, `A | B`.
|
||||||
|
- **Generics**: Generic types are first-class citizens with support for [bounds and variance](generics.md). No type erasure: in a generic function you can, for example, check `A in T`, where T is the generic type.
|
||||||
|
- **Inner classes and enums**: Full support for nested declarations, including [Enums with lifting](OOP.md#lifted-enum-entries).
|
||||||
|
|
||||||
|
## Other highlights
|
||||||
|
|
||||||
|
- **The `return` Statement**: Added support for local and non-local returns using labels.
|
||||||
|
- **Abstract Classes and Interfaces**: Full support for `abstract` members and the `interface` keyword.
|
||||||
|
- **Singleton Objects**: Define singletons using the `object` keyword or use anonymous object expressions.
|
||||||
|
- **Multiple Inheritance**: Enhanced multi-inheritance with predictable [C3 MRO resolution](OOP.md#multiple-inheritance-and-mro).
|
||||||
|
- **Unified Delegation**: Powerful delegation model for `val`, `var`, and `fun` members. See [Delegation](delegation.md).
|
||||||
|
- **Class Properties with Accessors**: Define `val` and `var` properties with custom `get()` and `set()`.
|
||||||
|
- **Restricted Setter Visibility**: Use `private set` and `protected set` on fields and properties.
|
||||||
|
- **Late-initialized `val`**: Support for `val` fields that are initialized in `init` blocks or class bodies.
|
||||||
|
- **Transient Members**: Use `@Transient` to exclude members from serialization and equality checks.
|
||||||
|
- **Named Arguments and Splats**: Improved call-site readability with `name: value` and map-based splats.
|
||||||
|
- **Refined Visibility**: Improved `protected` access and `closed` modifier for better encapsulation.
|
||||||
|
|
||||||
|
## Language Features
|
||||||
|
|
||||||
|
### The `return` Statement
|
||||||
|
You can now exit from the innermost enclosing callable (function or lambda) using `return`. Lyng also supports non-local returns to outer scopes using labels. See [Return Statement](return_statement.md).
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun findFirst<T>(list: Iterable<T>, predicate: (T)->Bool): T? {
|
||||||
|
list.forEach {
|
||||||
|
if (predicate(it)) return@findFirst it
|
||||||
|
}
|
||||||
|
null
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Abstract Classes and Interfaces
|
||||||
|
Lyng now supports the `abstract` modifier for classes and their members. `interface` is introduced as a synonym for `abstract class`, allowing for rich multi-inheritance patterns.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
interface Shape {
|
||||||
|
abstract val area: Real
|
||||||
|
fun describe() = "Area: %g"(area)
|
||||||
|
}
|
||||||
|
|
||||||
|
class Circle(val radius: Real) : Shape {
|
||||||
|
override val area get = Math.PI * radius * radius
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Class Properties with Accessors
|
||||||
|
Properties can now have custom getters and setters. They do not have automatic backing fields, making them perfect for computed values or delegation.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
class Rectangle(var width: Real, var height: Real) {
|
||||||
|
val area: Real get() = width * height
|
||||||
|
|
||||||
|
var squareSize: Real
|
||||||
|
get() = area
|
||||||
|
set(v) {
|
||||||
|
width = sqrt(v)
|
||||||
|
height = width
|
||||||
|
}
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Singleton Objects
|
||||||
|
Declare singletons or anonymous objects easily.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
object Database {
|
||||||
|
val connection = "connected"
|
||||||
|
}
|
||||||
|
|
||||||
|
val runner = object : Runnable {
|
||||||
|
override fun run() = println("Running!")
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
### Named Arguments and Named Splats
|
||||||
|
Improve call-site clarity by specifying argument names. You can also expand a Map into named arguments using the splat operator.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
fun configure(timeout: Int, retry: Int = 3) { ... }
|
||||||
|
|
||||||
|
configure(timeout: 5000, retry: 5)
|
||||||
|
val options = Map("timeout": 1000, "retry": 1)
|
||||||
|
configure(...options)
|
||||||
|
```
|
||||||
|
|
||||||
|
### Modern Operators
|
||||||
|
The `?=` operator allows for concise "assign if null" logic.
|
||||||
|
|
||||||
|
```lyng
|
||||||
|
var cache: Map? = null
|
||||||
|
cache ?= Map("status": "ok") // Only assigns if cache is null
|
||||||
|
```
|
||||||
|
|
||||||
|
## Tooling and IDE
|
||||||
|
|
||||||
|
- **IDEA Plugin**: Significant improvements to autocompletion, documentation tooltips, and natural language support (Grazie integration).
|
||||||
|
- **CLI**: The `lyng fmt` command is now a first-class tool for formatting code with various options like `--check` and `--in-place`.
|
||||||
|
- **Performance**: Ongoing optimizations in the bytecode VM and compiler for faster execution and smaller footprint.
|
||||||
|
|
||||||
|
## Standard Library
|
||||||
|
- **`with(self, block)`**: Scoped execution with a dedicated `self`.
|
||||||
|
- **`clamp(value, min, max)`**: Easily restrict values to a range.
|
||||||
|
|
||||||
|
## Migration Guide (from 1.3.*)
|
||||||
|
|
||||||
|
1. **Check Visibility**: Refined `protected` and `private` rules may catch previously undetected invalid accesses.
|
||||||
|
2. **Override Keyword**: Ensure all members that override ancestor declarations are marked with the `override` keyword (now mandatory).
|
||||||
|
3. **Return in Shorthand**: Remember that `return` is forbidden in `=` shorthand functions; use block syntax if you need early exit.
|
||||||
|
4. **Empty Map Literals**: Use `Map()` or `{:}` for empty maps, as `{}` is now strictly a block/lambda.
|
||||||
|
|
||||||
|
## References
|
||||||
|
- [Object Oriented Programming](OOP.md)
|
||||||
|
- [Generics](generics.md)
|
||||||
|
- [Return Statement](return_statement.md)
|
||||||
|
- [Delegation](delegation.md)
|
||||||
|
- [Tutorial](tutorial.md)
|
||||||
+2
-2
@@ -1,5 +1,5 @@
|
|||||||
#
|
#
|
||||||
# Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
# Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
#
|
#
|
||||||
# Licensed under the Apache License, Version 2.0 (the "License");
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
# you may not use this file except in compliance with the License.
|
# you may not use this file except in compliance with the License.
|
||||||
@@ -16,7 +16,7 @@
|
|||||||
#
|
#
|
||||||
|
|
||||||
#Gradle
|
#Gradle
|
||||||
org.gradle.jvmargs=-Xmx2048M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
org.gradle.jvmargs=-Xmx4096M -Dfile.encoding=UTF-8 -Dkotlin.daemon.jvm.options\="-Xmx2048M"
|
||||||
org.gradle.caching=true
|
org.gradle.caching=true
|
||||||
org.gradle.configuration-cache=true
|
org.gradle.configuration-cache=true
|
||||||
#Kotlin
|
#Kotlin
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ kotlin = "2.3.0"
|
|||||||
android-minSdk = "24"
|
android-minSdk = "24"
|
||||||
android-compileSdk = "34"
|
android-compileSdk = "34"
|
||||||
kotlinx-coroutines = "1.10.2"
|
kotlinx-coroutines = "1.10.2"
|
||||||
|
kotlinx-datetime = "0.6.1"
|
||||||
mp_bintools = "0.3.2"
|
mp_bintools = "0.3.2"
|
||||||
firebaseCrashlyticsBuildtools = "3.0.3"
|
firebaseCrashlyticsBuildtools = "3.0.3"
|
||||||
okioVersion = "3.10.2"
|
okioVersion = "3.10.2"
|
||||||
@@ -16,6 +17,7 @@ clikt-markdown = { module = "com.github.ajalt.clikt:clikt-markdown", version.ref
|
|||||||
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
kotlin-test = { module = "org.jetbrains.kotlin:kotlin-test", version.ref = "kotlin" }
|
||||||
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
|
kotlinx-coroutines-test = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-test", version.ref = "kotlinx-coroutines" }
|
||||||
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
kotlinx-coroutines-core = { module = "org.jetbrains.kotlinx:kotlinx-coroutines-core", version.ref = "kotlinx-coroutines" }
|
||||||
|
kotlinx-datetime = { module = "org.jetbrains.kotlinx:kotlinx-datetime", version.ref = "kotlinx-datetime" }
|
||||||
mp_bintools = { module = "net.sergeych:mp_bintools", version.ref = "mp_bintools" }
|
mp_bintools = { module = "net.sergeych:mp_bintools", version.ref = "mp_bintools" }
|
||||||
firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
|
firebase-crashlytics-buildtools = { group = "com.google.firebase", name = "firebase-crashlytics-buildtools", version.ref = "firebaseCrashlyticsBuildtools" }
|
||||||
okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }
|
okio = { module = "com.squareup.okio:okio", version.ref = "okioVersion" }
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
|
|
||||||
plugins {
|
plugins {
|
||||||
kotlin("jvm")
|
kotlin("jvm")
|
||||||
id("org.jetbrains.intellij") version "1.17.3"
|
id("org.jetbrains.intellij") version "1.17.4"
|
||||||
}
|
}
|
||||||
|
|
||||||
group = "net.sergeych.lyng"
|
group = "net.sergeych.lyng"
|
||||||
@@ -52,7 +52,7 @@ dependencies {
|
|||||||
intellij {
|
intellij {
|
||||||
type.set("IC")
|
type.set("IC")
|
||||||
// Build against a modern baseline. Install range is controlled by since/until below.
|
// Build against a modern baseline. Install range is controlled by since/until below.
|
||||||
version.set("2024.3.1")
|
version.set("2024.1.6")
|
||||||
// We manage <idea-version> ourselves in plugin.xml to keep it open-ended (no upper cap)
|
// We manage <idea-version> ourselves in plugin.xml to keep it open-ended (no upper cap)
|
||||||
updateSinceUntilBuild.set(false)
|
updateSinceUntilBuild.set(false)
|
||||||
// Include only available bundled plugins for this IDE build
|
// Include only available bundled plugins for this IDE build
|
||||||
|
|||||||
@@ -0,0 +1,145 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.actions
|
||||||
|
|
||||||
|
import com.intellij.execution.filters.TextConsoleBuilderFactory
|
||||||
|
import com.intellij.execution.ui.ConsoleView
|
||||||
|
import com.intellij.execution.ui.ConsoleViewContentType
|
||||||
|
import com.intellij.openapi.actionSystem.AnAction
|
||||||
|
import com.intellij.openapi.actionSystem.AnActionEvent
|
||||||
|
import com.intellij.openapi.actionSystem.CommonDataKeys
|
||||||
|
import com.intellij.openapi.project.Project
|
||||||
|
import com.intellij.openapi.wm.ToolWindow
|
||||||
|
import com.intellij.openapi.wm.ToolWindowAnchor
|
||||||
|
import com.intellij.openapi.wm.ToolWindowId
|
||||||
|
import com.intellij.openapi.wm.ToolWindowManager
|
||||||
|
import com.intellij.psi.PsiFile
|
||||||
|
import com.intellij.psi.PsiManager
|
||||||
|
import com.intellij.ui.content.ContentFactory
|
||||||
|
import kotlinx.coroutines.CoroutineScope
|
||||||
|
import kotlinx.coroutines.Dispatchers
|
||||||
|
import kotlinx.coroutines.SupervisorJob
|
||||||
|
import kotlinx.coroutines.launch
|
||||||
|
import net.sergeych.lyng.ExecutionError
|
||||||
|
import net.sergeych.lyng.Script
|
||||||
|
import net.sergeych.lyng.Source
|
||||||
|
import net.sergeych.lyng.requireScope
|
||||||
|
import net.sergeych.lyng.idea.LyngIcons
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
import net.sergeych.lyng.obj.getLyngExceptionMessageWithStackTrace
|
||||||
|
|
||||||
|
class RunLyngScriptAction : AnAction(LyngIcons.FILE) {
|
||||||
|
private val scope = CoroutineScope(Dispatchers.Default + SupervisorJob())
|
||||||
|
|
||||||
|
private fun getPsiFile(e: AnActionEvent): PsiFile? {
|
||||||
|
val project = e.project ?: return null
|
||||||
|
return e.getData(CommonDataKeys.PSI_FILE) ?: run {
|
||||||
|
val vf = e.getData(CommonDataKeys.VIRTUAL_FILE)
|
||||||
|
if (vf != null) PsiManager.getInstance(project).findFile(vf) else null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun update(e: AnActionEvent) {
|
||||||
|
val psiFile = getPsiFile(e)
|
||||||
|
val isLyng = psiFile?.name?.endsWith(".lyng") == true
|
||||||
|
e.presentation.isEnabledAndVisible = isLyng
|
||||||
|
if (isLyng) {
|
||||||
|
e.presentation.text = "Run '${psiFile.name}'"
|
||||||
|
} else {
|
||||||
|
e.presentation.text = "Run Lyng Script"
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun actionPerformed(e: AnActionEvent) {
|
||||||
|
val project = e.project ?: return
|
||||||
|
val psiFile = getPsiFile(e) ?: return
|
||||||
|
val text = psiFile.text
|
||||||
|
val fileName = psiFile.name
|
||||||
|
|
||||||
|
val (console, toolWindow) = getConsoleAndToolWindow(project)
|
||||||
|
console.clear()
|
||||||
|
|
||||||
|
toolWindow.show {
|
||||||
|
scope.launch {
|
||||||
|
try {
|
||||||
|
val lyngScope = Script.newScope()
|
||||||
|
lyngScope.addFn("print") {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
for ((i, arg) in args.list.withIndex()) {
|
||||||
|
if (i > 0) sb.append(" ")
|
||||||
|
sb.append(arg.toString(requireScope()).value)
|
||||||
|
}
|
||||||
|
console.print(sb.toString(), ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
lyngScope.addFn("println") {
|
||||||
|
val sb = StringBuilder()
|
||||||
|
for ((i, arg) in args.list.withIndex()) {
|
||||||
|
if (i > 0) sb.append(" ")
|
||||||
|
sb.append(arg.toString(requireScope()).value)
|
||||||
|
}
|
||||||
|
console.print(sb.toString() + "\n", ConsoleViewContentType.NORMAL_OUTPUT)
|
||||||
|
ObjVoid
|
||||||
|
}
|
||||||
|
|
||||||
|
console.print("--- Running $fileName ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
|
val result = lyngScope.eval(Source(fileName, text))
|
||||||
|
console.print("\n--- Finished with result: ${result.inspect(lyngScope)} ---\n", ConsoleViewContentType.SYSTEM_OUTPUT)
|
||||||
|
} catch (t: Throwable) {
|
||||||
|
console.print("\n--- Error ---\n", ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
if( t is ExecutionError ) {
|
||||||
|
val m = t.errorObject.getLyngExceptionMessageWithStackTrace()
|
||||||
|
console.print(m, ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
}
|
||||||
|
else
|
||||||
|
console.print(t.message ?: t.toString(), ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
console.print("\n", ConsoleViewContentType.ERROR_OUTPUT)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun getConsoleAndToolWindow(project: Project): Pair<ConsoleView, ToolWindow> {
|
||||||
|
val toolWindowManager = ToolWindowManager.getInstance(project)
|
||||||
|
var toolWindow = toolWindowManager.getToolWindow(ToolWindowId.RUN)
|
||||||
|
if (toolWindow == null) {
|
||||||
|
toolWindow = toolWindowManager.getToolWindow(ToolWindowId.MESSAGES_WINDOW)
|
||||||
|
}
|
||||||
|
if (toolWindow == null) {
|
||||||
|
toolWindow = toolWindowManager.getToolWindow("Lyng")
|
||||||
|
}
|
||||||
|
val actualToolWindow = toolWindow ?: run {
|
||||||
|
@Suppress("DEPRECATION")
|
||||||
|
toolWindowManager.registerToolWindow("Lyng", true, ToolWindowAnchor.BOTTOM)
|
||||||
|
}
|
||||||
|
|
||||||
|
val contentManager = actualToolWindow.contentManager
|
||||||
|
val existingContent = contentManager.findContent("Lyng Run")
|
||||||
|
if (existingContent != null) {
|
||||||
|
val console = existingContent.component as ConsoleView
|
||||||
|
contentManager.setSelectedContent(existingContent)
|
||||||
|
return console to actualToolWindow
|
||||||
|
}
|
||||||
|
|
||||||
|
val console = TextConsoleBuilderFactory.getInstance().createBuilder(project).console
|
||||||
|
val content = ContentFactory.getInstance().createContent(console.component, "Lyng Run", false)
|
||||||
|
contentManager.addContent(content)
|
||||||
|
contentManager.setSelectedContent(content)
|
||||||
|
return console to actualToolWindow
|
||||||
|
}
|
||||||
|
}
|
||||||
+42
-281
@@ -25,15 +25,13 @@ import com.intellij.openapi.progress.ProgressManager
|
|||||||
import com.intellij.openapi.util.Key
|
import com.intellij.openapi.util.Key
|
||||||
import com.intellij.openapi.util.TextRange
|
import com.intellij.openapi.util.TextRange
|
||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.binding.Binder
|
|
||||||
import net.sergeych.lyng.binding.SymbolKind
|
|
||||||
import net.sergeych.lyng.highlight.HighlightKind
|
import net.sergeych.lyng.highlight.HighlightKind
|
||||||
import net.sergeych.lyng.highlight.SimpleLyngHighlighter
|
|
||||||
import net.sergeych.lyng.highlight.offsetOf
|
import net.sergeych.lyng.highlight.offsetOf
|
||||||
import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
|
import net.sergeych.lyng.idea.highlight.LyngHighlighterColors
|
||||||
import net.sergeych.lyng.idea.util.LyngAstManager
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.tools.LyngDiagnosticSeverity
|
||||||
|
import net.sergeych.lyng.tools.LyngLanguageTools
|
||||||
|
import net.sergeych.lyng.tools.LyngSemanticKind
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* ExternalAnnotator that runs Lyng MiniAst on the document text in background
|
* ExternalAnnotator that runs Lyng MiniAst on the document text in background
|
||||||
@@ -43,11 +41,8 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?, val file: PsiFile)
|
data class Input(val text: String, val modStamp: Long, val previousSpans: List<Span>?, val file: PsiFile)
|
||||||
|
|
||||||
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
data class Span(val start: Int, val end: Int, val key: com.intellij.openapi.editor.colors.TextAttributesKey)
|
||||||
data class Error(val start: Int, val end: Int, val message: String)
|
data class Diag(val start: Int, val end: Int, val message: String, val severity: HighlightSeverity)
|
||||||
data class Result(val modStamp: Long, val spans: List<Span>, val error: Error? = null,
|
data class Result(val modStamp: Long, val spans: List<Span>, val diagnostics: List<Diag> = emptyList())
|
||||||
val spellIdentifiers: List<IntRange> = emptyList(),
|
|
||||||
val spellComments: List<IntRange> = emptyList(),
|
|
||||||
val spellStrings: List<IntRange> = emptyList())
|
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
override fun collectInformation(file: PsiFile): Input? {
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
val doc: Document = file.viewProvider.document ?: return null
|
||||||
@@ -62,197 +57,46 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
if (collectedInfo == null) return null
|
if (collectedInfo == null) return null
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
val text = collectedInfo.text
|
val text = collectedInfo.text
|
||||||
|
val analysis = LyngAstManager.getAnalysis(collectedInfo.file)
|
||||||
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
|
||||||
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
|
||||||
?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
|
?: return Result(collectedInfo.modStamp, collectedInfo.previousSpans ?: emptyList())
|
||||||
|
val mini = analysis.mini
|
||||||
ProgressManager.checkCanceled()
|
|
||||||
val source = Source(collectedInfo.file.name, text)
|
|
||||||
|
|
||||||
val out = ArrayList<Span>(256)
|
|
||||||
|
|
||||||
fun isFollowedByParenOrBlock(rangeEnd: Int): Boolean {
|
ProgressManager.checkCanceled()
|
||||||
var i = rangeEnd
|
|
||||||
while (i < text.length) {
|
val out = ArrayList<Span>(256)
|
||||||
val ch = text[i]
|
val diags = ArrayList<Diag>()
|
||||||
if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n') { i++; continue }
|
|
||||||
return ch == '(' || ch == '{'
|
|
||||||
}
|
|
||||||
return false
|
|
||||||
}
|
|
||||||
|
|
||||||
fun putRange(start: Int, end: Int, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
fun putRange(start: Int, end: Int, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
||||||
if (start in 0..end && end <= text.length && start < end) out += Span(start, end, key)
|
if (start in 0..end && end <= text.length && start < end) out += Span(start, end, key)
|
||||||
}
|
}
|
||||||
fun putName(startPos: net.sergeych.lyng.Pos, name: String, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
|
||||||
val s = source.offsetOf(startPos)
|
fun keyForKind(kind: LyngSemanticKind): com.intellij.openapi.editor.colors.TextAttributesKey? = when (kind) {
|
||||||
putRange(s, (s + name.length).coerceAtMost(text.length), key)
|
LyngSemanticKind.Function -> LyngHighlighterColors.FUNCTION
|
||||||
}
|
LyngSemanticKind.Class, LyngSemanticKind.Enum, LyngSemanticKind.TypeAlias -> LyngHighlighterColors.TYPE
|
||||||
fun putMiniRange(r: MiniRange, key: com.intellij.openapi.editor.colors.TextAttributesKey) {
|
LyngSemanticKind.Value -> LyngHighlighterColors.VALUE
|
||||||
val s = source.offsetOf(r.start)
|
LyngSemanticKind.Variable -> LyngHighlighterColors.VARIABLE
|
||||||
val e = source.offsetOf(r.end)
|
LyngSemanticKind.Parameter -> LyngHighlighterColors.PARAMETER
|
||||||
putRange(s, e, key)
|
LyngSemanticKind.TypeRef -> LyngHighlighterColors.TYPE
|
||||||
|
LyngSemanticKind.EnumConstant -> LyngHighlighterColors.ENUM_CONSTANT
|
||||||
}
|
}
|
||||||
|
|
||||||
// Declarations
|
// Semantic highlights from shared tooling
|
||||||
mini.declarations.forEach { d ->
|
LyngLanguageTools.semanticHighlights(analysis).forEach { span ->
|
||||||
if (d.nameStart.source != source) return@forEach
|
keyForKind(span.kind)?.let { putRange(span.range.start, span.range.endExclusive, it) }
|
||||||
when (d) {
|
|
||||||
is MiniFunDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.FUNCTION_DECLARATION)
|
|
||||||
is MiniClassDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
|
|
||||||
is MiniValDecl -> putName(
|
|
||||||
d.nameStart,
|
|
||||||
d.name,
|
|
||||||
if (d.mutable) LyngHighlighterColors.VARIABLE else LyngHighlighterColors.VALUE
|
|
||||||
)
|
|
||||||
is MiniEnumDecl -> putName(d.nameStart, d.name, LyngHighlighterColors.TYPE)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Imports: each segment as namespace/path
|
// Imports: each segment as namespace/path
|
||||||
mini.imports.forEach { imp ->
|
mini?.imports?.forEach { imp ->
|
||||||
if (imp.range.start.source != source) return@forEach
|
imp.segments.forEach { seg ->
|
||||||
imp.segments.forEach { seg -> putMiniRange(seg.range, LyngHighlighterColors.NAMESPACE) }
|
val start = analysis.source.offsetOf(seg.range.start)
|
||||||
}
|
val end = analysis.source.offsetOf(seg.range.end)
|
||||||
|
putRange(start, end, LyngHighlighterColors.NAMESPACE)
|
||||||
// Parameters
|
|
||||||
mini.declarations.filterIsInstance<MiniFunDecl>().forEach { fn ->
|
|
||||||
if (fn.nameStart.source != source) return@forEach
|
|
||||||
fn.params.forEach { p -> putName(p.nameStart, p.name, LyngHighlighterColors.PARAMETER) }
|
|
||||||
}
|
|
||||||
|
|
||||||
// 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 -> {}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
mini.declarations.forEach { d ->
|
|
||||||
if (d.nameStart.source != source) return@forEach
|
|
||||||
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) }
|
|
||||||
}
|
|
||||||
is MiniEnumDecl -> {}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
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()
|
|
||||||
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
|
|
||||||
// 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 }
|
|
||||||
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 {
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
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
|
||||||
@@ -278,7 +122,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
text.substring(wStart, wEnd)
|
text.substring(wStart, wEnd)
|
||||||
} else null
|
} else null
|
||||||
|
|
||||||
if (prevWord in setOf("return", "break", "continue") || isFollowedByParenOrBlock(end)) {
|
if (prevWord in setOf("return", "break", "continue")) {
|
||||||
putRange(start, end, LyngHighlighterColors.LABEL)
|
putRange(start, end, LyngHighlighterColors.LABEL)
|
||||||
} else {
|
} else {
|
||||||
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
putRange(start, end, LyngHighlighterColors.ANNOTATION)
|
||||||
@@ -291,47 +135,16 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map Enum constants from token highlighter to IDEA enum constant color
|
analysis.diagnostics.forEach { d ->
|
||||||
run {
|
val range = d.range ?: return@forEach
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
val severity = if (d.severity == LyngDiagnosticSeverity.Warning) HighlightSeverity.WARNING else HighlightSeverity.ERROR
|
||||||
tokens.forEach { s ->
|
diags += Diag(range.start, range.endExclusive, d.message, severity)
|
||||||
if (s.kind == HighlightKind.EnumConstant) {
|
|
||||||
val start = s.range.start
|
|
||||||
val end = s.range.endExclusive
|
|
||||||
if (start in 0..end && end <= text.length && start < end) {
|
|
||||||
putRange(start, end, LyngHighlighterColors.ENUM_CONSTANT)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build spell index payload: identifiers from symbols + references; comments/strings from simple highlighter
|
return Result(collectedInfo.modStamp, out, diags)
|
||||||
val idRanges = mutableSetOf<IntRange>()
|
|
||||||
try {
|
|
||||||
val binding = Binder.bind(text, mini)
|
|
||||||
binding.symbols.forEach { sym ->
|
|
||||||
val s = sym.declStart
|
|
||||||
val e = sym.declEnd
|
|
||||||
if (s in 0..e && e <= text.length && s < e) idRanges += (s until e)
|
|
||||||
}
|
|
||||||
binding.references.forEach { ref ->
|
|
||||||
val s = ref.start
|
|
||||||
val e = ref.end
|
|
||||||
if (s in 0..e && e <= text.length && s < e) idRanges += (s until e)
|
|
||||||
}
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// Best-effort; no identifiers if binder fails
|
|
||||||
}
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
val commentRanges = tokens.filter { it.kind == HighlightKind.Comment }.map { it.range.start until it.range.endExclusive }
|
|
||||||
val stringRanges = tokens.filter { it.kind == HighlightKind.String }.map { it.range.start until it.range.endExclusive }
|
|
||||||
|
|
||||||
return Result(collectedInfo.modStamp, out, null,
|
|
||||||
spellIdentifiers = idRanges.toList(),
|
|
||||||
spellComments = commentRanges,
|
|
||||||
spellStrings = stringRanges)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
||||||
if (annotationResult == null) return
|
if (annotationResult == null) return
|
||||||
// Skip if cache is up-to-date
|
// Skip if cache is up-to-date
|
||||||
@@ -342,32 +155,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
val doc = file.viewProvider.document
|
val doc = file.viewProvider.document
|
||||||
|
|
||||||
// Store spell index for spell/grammar engines to consume (suspend until ready)
|
|
||||||
val ids = result.spellIdentifiers.map { TextRange(it.first, it.last + 1) }
|
|
||||||
val coms = result.spellComments.map { TextRange(it.first, it.last + 1) }
|
|
||||||
val strs = result.spellStrings.map { TextRange(it.first, it.last + 1) }
|
|
||||||
net.sergeych.lyng.idea.spell.LyngSpellIndex.store(file,
|
|
||||||
net.sergeych.lyng.idea.spell.LyngSpellIndex.Data(
|
|
||||||
modStamp = result.modStamp,
|
|
||||||
identifiers = ids,
|
|
||||||
comments = coms,
|
|
||||||
strings = strs
|
|
||||||
)
|
|
||||||
)
|
|
||||||
|
|
||||||
// Optional diagnostic overlay: visualize the ranges we will feed to spellcheckers
|
|
||||||
val settings = net.sergeych.lyng.idea.settings.LyngFormatterSettings.getInstance(file.project)
|
|
||||||
if (settings.debugShowSpellFeed) {
|
|
||||||
fun paint(r: TextRange, label: String) {
|
|
||||||
holder.newAnnotation(HighlightSeverity.WEAK_WARNING, "spell-feed: $label")
|
|
||||||
.range(r)
|
|
||||||
.create()
|
|
||||||
}
|
|
||||||
ids.forEach { paint(it, "id") }
|
|
||||||
coms.forEach { paint(it, "comment") }
|
|
||||||
if (settings.spellCheckStringLiterals) strs.forEach { paint(it, "string") }
|
|
||||||
}
|
|
||||||
|
|
||||||
for (s in result.spans) {
|
for (s in result.spans) {
|
||||||
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
holder.newSilentAnnotation(HighlightSeverity.INFORMATION)
|
||||||
.range(TextRange(s.start, s.end))
|
.range(TextRange(s.start, s.end))
|
||||||
@@ -375,13 +162,12 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
.create()
|
.create()
|
||||||
}
|
}
|
||||||
|
|
||||||
// Show syntax error if present
|
// Show errors and warnings
|
||||||
val err = result.error
|
result.diagnostics.forEach { d ->
|
||||||
if (err != null) {
|
val start = d.start.coerceIn(0, (doc?.textLength ?: 0))
|
||||||
val start = err.start.coerceIn(0, (doc?.textLength ?: 0))
|
val end = d.end.coerceIn(start, (doc?.textLength ?: start))
|
||||||
val end = err.end.coerceIn(start, (doc?.textLength ?: start))
|
|
||||||
if (end > start) {
|
if (end > start) {
|
||||||
holder.newAnnotation(HighlightSeverity.ERROR, err.message)
|
holder.newAnnotation(d.severity, d.message)
|
||||||
.range(TextRange(start, end))
|
.range(TextRange(start, end))
|
||||||
.create()
|
.create()
|
||||||
}
|
}
|
||||||
@@ -402,30 +188,5 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
return -1
|
return -1
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Make the error highlight a bit wider than a single character so it is easier to see and click.
|
|
||||||
* Strategy:
|
|
||||||
* - If the offset points inside an identifier-like token (letters/digits/underscore), expand to the full token.
|
|
||||||
* - Otherwise select a small range starting at the offset with a minimum width, but not crossing the line end.
|
|
||||||
*/
|
|
||||||
private fun expandErrorRange(text: String, rawStart: Int): Pair<Int, Int> {
|
|
||||||
if (text.isEmpty()) return 0 to 0
|
|
||||||
val len = text.length
|
|
||||||
val start = rawStart.coerceIn(0, len)
|
|
||||||
fun isWord(ch: Char) = ch == '_' || ch.isLetterOrDigit()
|
|
||||||
|
|
||||||
if (start < len && isWord(text[start])) {
|
|
||||||
var s = start
|
|
||||||
var e = start
|
|
||||||
while (s > 0 && isWord(text[s - 1])) s--
|
|
||||||
while (e < len && isWord(text[e])) e++
|
|
||||||
return s to e
|
|
||||||
}
|
|
||||||
|
|
||||||
// Not inside a word: select a short, visible range up to EOL
|
|
||||||
val lineEnd = text.indexOf('\n', start).let { if (it == -1) len else it }
|
|
||||||
val minWidth = 4
|
|
||||||
val end = (start + minWidth).coerceAtMost(lineEnd).coerceAtLeast((start + 1).coerceAtMost(lineEnd))
|
|
||||||
return start to end
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
+60
-47
@@ -96,9 +96,10 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
log.info("[LYNG_DEBUG] Completion: caret=$caret prefix='${prefix}' memberDotPos=${memberDotPos} file='${file.name}'")
|
log.info("[LYNG_DEBUG] Completion: caret=$caret prefix='${prefix}' memberDotPos=${memberDotPos} file='${file.name}'")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build MiniAst (cached) for both global and member contexts to enable local class/val inference
|
// Build analysis (cached) for both global and member contexts to enable local class/val inference
|
||||||
val mini = LyngAstManager.getMiniAst(file)
|
val analysis = LyngAstManager.getAnalysis(file)
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val mini = analysis?.mini
|
||||||
|
val binding = analysis?.binding
|
||||||
|
|
||||||
// Delegate computation to the shared engine to keep behavior in sync with tests
|
// Delegate computation to the shared engine to keep behavior in sync with tests
|
||||||
val engineItems = try {
|
val engineItems = try {
|
||||||
@@ -116,11 +117,12 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
if (memberDotPos != null && engineItems.isEmpty()) {
|
if (memberDotPos != null && engineItems.isEmpty()) {
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback: engine returned 0 in member context; trying local inference")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback: engine returned 0 in member context; trying local inference")
|
||||||
// Build imported modules from text (lenient) + stdlib; avoid heavy MiniAst here
|
// Build imported modules from text (lenient) + stdlib; avoid heavy MiniAst here
|
||||||
val fromText = extractImportsFromText(text)
|
val fromText = DocLookupUtils.extractImportsFromText(text)
|
||||||
val imported = LinkedHashSet<String>().apply {
|
val imported = LinkedHashSet<String>().apply {
|
||||||
fromText.forEach { add(it) }
|
fromText.forEach { add(it) }
|
||||||
add("lyng.stdlib")
|
add("lyng.stdlib")
|
||||||
}.toList()
|
}.toList()
|
||||||
|
val staticOnly = DocLookupUtils.isStaticReceiver(mini, text, memberDotPos, imported, binding)
|
||||||
|
|
||||||
// Try inferring return/receiver class around the dot
|
// Try inferring return/receiver class around the dot
|
||||||
val inferred =
|
val inferred =
|
||||||
@@ -135,7 +137,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
|
|
||||||
if (inferred != null) {
|
if (inferred != null) {
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback inferred receiver/return class='$inferred' — offering its members")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback inferred receiver/return class='$inferred' — offering its members")
|
||||||
offerMembers(emit, imported, inferred, sourceText = text, mini = mini)
|
offerMembers(emit, imported, inferred, staticOnly = staticOnly, sourceText = text, mini = mini)
|
||||||
return
|
return
|
||||||
} else {
|
} else {
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback could not infer class; keeping list empty (no globals after dot)")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Fallback could not infer class; keeping list empty (no globals after dot)")
|
||||||
@@ -160,6 +162,8 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withIcon(AllIcons.Nodes.Class)
|
.withIcon(AllIcons.Nodes.Class)
|
||||||
Kind.Enum -> LookupElementBuilder.create(ci.name)
|
Kind.Enum -> LookupElementBuilder.create(ci.name)
|
||||||
.withIcon(AllIcons.Nodes.Enum)
|
.withIcon(AllIcons.Nodes.Enum)
|
||||||
|
Kind.TypeAlias -> LookupElementBuilder.create(ci.name)
|
||||||
|
.withIcon(AllIcons.Nodes.Class)
|
||||||
Kind.Value -> LookupElementBuilder.create(ci.name)
|
Kind.Value -> LookupElementBuilder.create(ci.name)
|
||||||
.withIcon(AllIcons.Nodes.Variable)
|
.withIcon(AllIcons.Nodes.Variable)
|
||||||
.let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
|
.let { b -> if (!ci.typeText.isNullOrBlank()) b.withTypeText(ci.typeText, true) else b }
|
||||||
@@ -167,12 +171,16 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withIcon(AllIcons.Nodes.Field)
|
.withIcon(AllIcons.Nodes.Field)
|
||||||
.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 }
|
||||||
}
|
}
|
||||||
emit(builder)
|
if (ci.priority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, ci.priority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
// In member context, ensure stdlib extension-like methods (e.g., String.re) are present
|
// In member context, ensure stdlib extension-like methods (e.g., String.re) are present
|
||||||
if (memberDotPos != null) {
|
if (memberDotPos != null) {
|
||||||
val existing = engineItems.map { it.name }.toMutableSet()
|
val existing = engineItems.map { it.name }.toMutableSet()
|
||||||
val fromText = extractImportsFromText(text)
|
val fromText = DocLookupUtils.extractImportsFromText(text)
|
||||||
val imported = LinkedHashSet<String>().apply {
|
val imported = LinkedHashSet<String>().apply {
|
||||||
fromText.forEach { add(it) }
|
fromText.forEach { add(it) }
|
||||||
add("lyng.stdlib")
|
add("lyng.stdlib")
|
||||||
@@ -245,7 +253,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
// If in member context and engine items are suspiciously sparse, try to enrich via local inference + offerMembers
|
// If in member context and engine items are suspiciously sparse, try to enrich via local inference + offerMembers
|
||||||
if (memberDotPos != null && engineItems.size < 3) {
|
if (memberDotPos != null && engineItems.size < 3) {
|
||||||
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Engine produced only ${engineItems.size} items in member context — trying enrichment")
|
if (DEBUG_COMPLETION) log.info("[LYNG_DEBUG] Engine produced only ${engineItems.size} items in member context — trying enrichment")
|
||||||
val fromText = extractImportsFromText(text)
|
val fromText = DocLookupUtils.extractImportsFromText(text)
|
||||||
val imported = LinkedHashSet<String>().apply {
|
val imported = LinkedHashSet<String>().apply {
|
||||||
fromText.forEach { add(it) }
|
fromText.forEach { add(it) }
|
||||||
add("lyng.stdlib")
|
add("lyng.stdlib")
|
||||||
@@ -288,6 +296,9 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
}
|
}
|
||||||
is MiniEnumDecl -> LookupElementBuilder.create(name)
|
is MiniEnumDecl -> LookupElementBuilder.create(name)
|
||||||
.withIcon(AllIcons.Nodes.Enum)
|
.withIcon(AllIcons.Nodes.Enum)
|
||||||
|
is MiniTypeAliasDecl -> LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Class)
|
||||||
|
.withTypeText(typeOf(d.target), true)
|
||||||
}
|
}
|
||||||
emit(builder)
|
emit(builder)
|
||||||
}
|
}
|
||||||
@@ -365,6 +376,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
when (m) {
|
when (m) {
|
||||||
is MiniMemberFunDecl -> if (!m.isStatic) continue
|
is MiniMemberFunDecl -> if (!m.isStatic) continue
|
||||||
is MiniMemberValDecl -> if (!m.isStatic) continue
|
is MiniMemberValDecl -> if (!m.isStatic) continue
|
||||||
|
is MiniMemberTypeAliasDecl -> if (!m.isStatic) continue
|
||||||
is MiniInitDecl -> continue
|
is MiniInitDecl -> continue
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -401,18 +413,23 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
}
|
}
|
||||||
supplementPreferredBases(className)
|
supplementPreferredBases(className)
|
||||||
|
|
||||||
fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>) {
|
fun emitGroup(map: LinkedHashMap<String, MutableList<MiniMemberDecl>>, groupPriority: Double) {
|
||||||
val keys = map.keys.sortedBy { it.lowercase() }
|
val keys = map.keys.sortedBy { it.lowercase() }
|
||||||
for (name in keys) {
|
for (name in keys) {
|
||||||
val list = map[name] ?: continue
|
val list = map[name] ?: continue
|
||||||
// Choose a representative for display:
|
// Choose a representative for display:
|
||||||
// 1) Prefer a method with a known return type
|
// 1) Prefer a method with return type AND parameters
|
||||||
// 2) Else any method
|
// 2) Prefer a method with parameters
|
||||||
// 3) Else the first variant
|
// 3) Prefer a method with return type
|
||||||
|
// 4) Else any method
|
||||||
|
// 5) Else the first variant
|
||||||
val rep =
|
val rep =
|
||||||
list.asSequence()
|
list.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
.filterIsInstance<MiniMemberFunDecl>()
|
.firstOrNull { it.returnType != null && it.params.isNotEmpty() }
|
||||||
.firstOrNull { it.returnType != null }
|
?: list.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
|
.firstOrNull { it.params.isNotEmpty() }
|
||||||
|
?: list.asSequence().filterIsInstance<MiniMemberFunDecl>()
|
||||||
|
.firstOrNull { it.returnType != null }
|
||||||
?: list.firstOrNull { it is MiniMemberFunDecl }
|
?: list.firstOrNull { it is MiniMemberFunDecl }
|
||||||
?: list.first()
|
?: list.first()
|
||||||
when (rep) {
|
when (rep) {
|
||||||
@@ -428,7 +445,11 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withTailText(tail, true)
|
.withTailText(tail, true)
|
||||||
.withTypeText(ret, true)
|
.withTypeText(ret, true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
if (groupPriority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
is MiniMemberValDecl -> {
|
is MiniMemberValDecl -> {
|
||||||
val icon = if (rep.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field
|
val icon = if (rep.mutable) AllIcons.Nodes.Variable else AllIcons.Nodes.Field
|
||||||
@@ -439,7 +460,21 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
val builder = LookupElementBuilder.create(name)
|
val builder = LookupElementBuilder.create(name)
|
||||||
.withIcon(icon)
|
.withIcon(icon)
|
||||||
.withTypeText(typeOf(chosen.type), true)
|
.withTypeText(typeOf(chosen.type), true)
|
||||||
emit(builder)
|
if (groupPriority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is MiniMemberTypeAliasDecl -> {
|
||||||
|
val builder = LookupElementBuilder.create(name)
|
||||||
|
.withIcon(AllIcons.Nodes.Class)
|
||||||
|
.withTypeText(typeOf(rep.target), true)
|
||||||
|
if (groupPriority != 0.0) {
|
||||||
|
emit(PrioritizedLookupElement.withPriority(builder, groupPriority))
|
||||||
|
} else {
|
||||||
|
emit(builder)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
is MiniInitDecl -> {}
|
is MiniInitDecl -> {}
|
||||||
}
|
}
|
||||||
@@ -447,8 +482,8 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Emit what we have first
|
// Emit what we have first
|
||||||
emitGroup(directMap)
|
emitGroup(directMap, 100.0)
|
||||||
emitGroup(inheritedMap)
|
emitGroup(inheritedMap, 0.0)
|
||||||
|
|
||||||
// If suggestions are suspiciously sparse for known container classes,
|
// If suggestions are suspiciously sparse for known container classes,
|
||||||
// try to conservatively supplement using a curated list resolved via docs registry.
|
// try to conservatively supplement using a curated list resolved via docs registry.
|
||||||
@@ -509,7 +544,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
emit(builder)
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
already.add(name)
|
already.add(name)
|
||||||
} else {
|
} else {
|
||||||
// Synthetic fallback: method without detailed params/types to improve UX in absence of docs
|
// Synthetic fallback: method without detailed params/types to improve UX in absence of docs
|
||||||
@@ -523,7 +558,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withTailText("()", true)
|
.withTailText("()", true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
}
|
}
|
||||||
emit(builder)
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
already.add(name)
|
already.add(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -576,7 +611,7 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
emit(builder)
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
already.add(name)
|
already.add(name)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
@@ -585,38 +620,16 @@ class LyngCompletionContributor : CompletionContributor() {
|
|||||||
.withIcon(AllIcons.Nodes.Method)
|
.withIcon(AllIcons.Nodes.Method)
|
||||||
.withTailText("()", true)
|
.withTailText("()", true)
|
||||||
.withInsertHandler(ParenInsertHandler)
|
.withInsertHandler(ParenInsertHandler)
|
||||||
emit(builder)
|
emit(PrioritizedLookupElement.withPriority(builder, 50.0))
|
||||||
already.add(name)
|
already.add(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Lenient textual import extractor (duplicated from QuickDoc privately)
|
|
||||||
private fun extractImportsFromText(text: String): List<String> {
|
|
||||||
val result = LinkedHashSet<String>()
|
|
||||||
val re = Regex("^\\s*import\\s+([a-zA-Z_][a-zA-Z0-9_]*(?:\\.[a-zA-Z_][a-zA-Z0-9_]*)*)", RegexOption.MULTILINE)
|
|
||||||
re.findAll(text).forEach { m ->
|
|
||||||
val raw = m.groupValues.getOrNull(1)?.trim().orEmpty()
|
|
||||||
if (raw.isNotEmpty()) {
|
|
||||||
val canon = if (raw.startsWith("lyng.")) raw else "lyng.$raw"
|
|
||||||
result.add(canon)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result.toList()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun typeOf(t: MiniTypeRef?): String {
|
private fun typeOf(t: MiniTypeRef?): String {
|
||||||
return when (t) {
|
val s = DocLookupUtils.typeOf(t)
|
||||||
null -> ""
|
return if (s.isEmpty()) "" else ": $s"
|
||||||
is MiniTypeName -> t.segments.lastOrNull()?.name?.let { ": $it" } ?: ""
|
|
||||||
is MiniGenericType -> {
|
|
||||||
val base = typeOf(t.base).removePrefix(": ")
|
|
||||||
val args = t.args.joinToString(",") { typeOf(it).removePrefix(": ") }
|
|
||||||
": ${base}<${args}>"
|
|
||||||
}
|
|
||||||
is MiniFunctionType -> ": (fn)"
|
|
||||||
is MiniTypeVar -> ": ${t.name}"
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
+167
-38
@@ -29,6 +29,8 @@ import net.sergeych.lyng.idea.LyngLanguage
|
|||||||
import net.sergeych.lyng.idea.util.LyngAstManager
|
import net.sergeych.lyng.idea.util.LyngAstManager
|
||||||
import net.sergeych.lyng.idea.util.TextCtx
|
import net.sergeych.lyng.idea.util.TextCtx
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
|
import net.sergeych.lyng.tools.LyngLanguageTools
|
||||||
|
import net.sergeych.lyng.tools.LyngSymbolInfo
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Quick Docs backed by MiniAst: when caret is on an identifier that corresponds
|
* Quick Docs backed by MiniAst: when caret is on an identifier that corresponds
|
||||||
@@ -66,9 +68,15 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: ident='$ident' at ${idRange.startOffset}..${idRange.endOffset} in ${file.name}")
|
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: ident='$ident' at ${idRange.startOffset}..${idRange.endOffset} in ${file.name}")
|
||||||
|
|
||||||
// 1. Get merged mini-AST from Manager (handles local + .lyng.d merged declarations)
|
// 1. Get merged mini-AST from Manager (handles local + .lyng.d merged declarations)
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
val analysis = LyngAstManager.getAnalysis(file) ?: return null
|
||||||
|
val mini = analysis.mini ?: return null
|
||||||
val miniSource = mini.range.start.source
|
val miniSource = mini.range.start.source
|
||||||
val imported = DocLookupUtils.canonicalImportedModules(mini, text)
|
val imported = analysis.importedModules.ifEmpty { DocLookupUtils.canonicalImportedModules(mini, text) }
|
||||||
|
|
||||||
|
// Single-source quick doc lookup
|
||||||
|
LyngLanguageTools.docAt(analysis, offset)?.let { info ->
|
||||||
|
renderDocFromInfo(info)?.let { return it }
|
||||||
|
}
|
||||||
|
|
||||||
// Try resolve to: function param at position, function/class/val declaration at position
|
// Try resolve to: function param at position, function/class/val declaration at position
|
||||||
// 1) Use unified declaration detection
|
// 1) Use unified declaration detection
|
||||||
@@ -91,6 +99,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
|
is MiniMemberFunDecl -> renderMemberFunDoc(d.name, m)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
|
is MiniMemberValDecl -> renderMemberValDoc(d.name, m)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(d.name, m)
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -139,7 +148,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val e: Int = miniSource.offsetOf(d.range.end)
|
val e: Int = miniSource.offsetOf(d.range.end)
|
||||||
if (offset >= s && offset <= e) {
|
if (offset >= s && offset <= e) {
|
||||||
// For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
|
// For enum constant, we don't have detailed docs in MiniAst yet, but we can render a title
|
||||||
return "<div class='doc-title'>enum constant ${d.name}.${name}</div>"
|
return renderTitle("enum constant ${d.name}.${name}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -197,6 +206,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
|
is MiniMemberFunDecl -> renderMemberFunDoc(cls.name, m)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
|
is MiniMemberValDecl -> renderMemberValDoc(cls.name, m)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(cls.name, m)
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -307,16 +317,19 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
}
|
}
|
||||||
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: memberCtx dotPos=${dotPos} chBeforeDot='${if (dotPos > 0) text[dotPos - 1] else ' '}' classGuess=${className} imports=${importedModules}")
|
if (DEBUG_LOG) log.info("[LYNG_DEBUG] QuickDoc: memberCtx dotPos=${dotPos} chBeforeDot='${if (dotPos > 0) text[dotPos - 1] else ' '}' classGuess=${className} imports=${importedModules}")
|
||||||
if (className != null) {
|
if (className != null) {
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini)?.let { (owner, member) ->
|
val staticOnly = DocLookupUtils.isStaticReceiver(mini, text, dotPos, importedModules, analysis.binding)
|
||||||
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini, staticOnly = staticOnly)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] QuickDoc: literal/call '$ident' resolved to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] QuickDoc: literal/call '$ident' resolved to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: resolve failed for ${className}.${ident}")
|
log.info("[LYNG_DEBUG] QuickDoc: resolve failed for ${className}.${ident}")
|
||||||
@@ -354,6 +367,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
// And classes/enums
|
// And classes/enums
|
||||||
docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
docs.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
|
docs.filterIsInstance<MiniTypeAliasDecl>().firstOrNull { it.name == ident }?.let { return renderDeclDoc(it, text, mini, imported) }
|
||||||
}
|
}
|
||||||
// Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
|
// Defensive fallback: if nothing found and it's a well-known stdlib function, render minimal inline docs
|
||||||
if (ident == "println" || ident == "print") {
|
if (ident == "println" || ident == "print") {
|
||||||
@@ -361,22 +375,26 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
"Print values to the standard output and append a newline. Accepts any number of arguments." else
|
"Print values to the standard output and append a newline. Accepts any number of arguments." else
|
||||||
"Print values to the standard output without a trailing newline. Accepts any number of arguments."
|
"Print values to the standard output without a trailing newline. Accepts any number of arguments."
|
||||||
val title = "function $ident(values)"
|
val title = "function $ident(values)"
|
||||||
return "<div class='doc-title'>${htmlEscape(title)}</div>" + styledMarkdown(htmlEscape(fallback))
|
return renderTitle(title) + styledMarkdown(htmlEscape(fallback))
|
||||||
}
|
}
|
||||||
// 4b) try class members like ClassName.member with inheritance fallback
|
// 4b) try class members like ClassName.member with inheritance fallback
|
||||||
val lhs = previousWordBefore(text, idRange.startOffset)
|
val lhs = previousWordBefore(text, idRange.startOffset)
|
||||||
if (lhs != null && hasDotBetween(text, lhs.endOffset, idRange.startOffset)) {
|
if (lhs != null && hasDotBetween(text, lhs.endOffset, idRange.startOffset)) {
|
||||||
val className = text.substring(lhs.startOffset, lhs.endOffset)
|
val className = text.substring(lhs.startOffset, lhs.endOffset)
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini)?.let { (owner, member) ->
|
val dotPos = findDotLeft(text, idRange.startOffset)
|
||||||
|
val staticOnly = dotPos?.let { DocLookupUtils.isStaticReceiver(mini, text, it, importedModules, analysis.binding) } ?: false
|
||||||
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, className, ident, mini, staticOnly = staticOnly)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Inheritance resolved $className.$ident to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Inheritance resolved $className.$ident to $owner.${member.name}")
|
||||||
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 {
|
||||||
@@ -390,16 +408,19 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
else -> DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules, mini)
|
else -> DocLookupUtils.guessClassFromCallBefore(text, dotPos, importedModules, mini)
|
||||||
}
|
}
|
||||||
if (guessed != null) {
|
if (guessed != null) {
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, guessed, ident, mini)?.let { (owner, member) ->
|
val staticOnly = DocLookupUtils.isStaticReceiver(mini, text, dotPos, importedModules, analysis.binding)
|
||||||
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, guessed, ident, mini, staticOnly = staticOnly)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Heuristic '$guessed.$ident' resolved via inheritance to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Heuristic '$guessed.$ident' resolved via inheritance to $owner.${member.name}")
|
||||||
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 {
|
||||||
@@ -407,16 +428,19 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
run {
|
run {
|
||||||
val candidates = listOf("String", "Iterable", "Iterator", "List", "Collection", "Array", "Dict", "Regex")
|
val candidates = listOf("String", "Iterable", "Iterator", "List", "Collection", "Array", "Dict", "Regex")
|
||||||
for (c in candidates) {
|
for (c in candidates) {
|
||||||
DocLookupUtils.resolveMemberWithInheritance(importedModules, c, ident, mini)?.let { (owner, member) ->
|
val staticOnly = DocLookupUtils.isStaticReceiver(mini, text, dotPos, importedModules, analysis.binding)
|
||||||
|
DocLookupUtils.resolveMemberWithInheritance(importedModules, c, ident, mini, staticOnly = staticOnly)?.let { (owner, member) ->
|
||||||
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Candidate '$c.$ident' resolved via inheritance to $owner.${member.name}")
|
if (DEBUG_INHERITANCE) log.info("[LYNG_DEBUG] Candidate '$c.$ident' resolved via inheritance to $owner.${member.name}")
|
||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -431,6 +455,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (m) {
|
return when (m) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc("String", m)
|
is MiniMemberFunDecl -> renderMemberFunDoc("String", m)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc("String", m)
|
is MiniMemberValDecl -> renderMemberValDoc("String", m)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc("String", m)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -441,11 +466,13 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return when (member) {
|
return when (member) {
|
||||||
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
is MiniMemberFunDecl -> renderMemberFunDoc(owner, member)
|
||||||
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
is MiniMemberValDecl -> renderMemberValDoc(owner, member)
|
||||||
|
is MiniMemberTypeAliasDecl -> renderMemberTypeAliasDoc(owner, member)
|
||||||
is MiniInitDecl -> null
|
is MiniInitDecl -> null
|
||||||
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniFunDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniValDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniClassDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
is MiniEnumDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
|
is MiniTypeAliasDecl -> renderDeclDoc(member, text, mini, importedModules)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -461,25 +488,39 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
private fun ensureExternalDocsRegistered() { @Suppress("UNUSED_EXPRESSION") externalDocsLoaded }
|
private fun ensureExternalDocsRegistered() { @Suppress("UNUSED_EXPRESSION") externalDocsLoaded }
|
||||||
|
|
||||||
private fun tryLoadExternalDocs(): Boolean {
|
private fun tryLoadExternalDocs(): Boolean {
|
||||||
return try {
|
var anyLoaded = false
|
||||||
|
try {
|
||||||
// Try known registrars; ignore failures if module is absent
|
// Try known registrars; ignore failures if module is absent
|
||||||
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
||||||
val m = cls.getMethod("ensure")
|
val m = cls.getMethod("ensure")
|
||||||
m.invoke(null)
|
m.invoke(null)
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
||||||
true
|
anyLoaded = true
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {}
|
||||||
|
|
||||||
|
try {
|
||||||
|
val cls = Class.forName("net.sergeych.lyngio.docs.ProcessBuiltinDocs")
|
||||||
|
val m = cls.getMethod("ensure")
|
||||||
|
m.invoke(null)
|
||||||
|
log.info("[LYNG_DEBUG] QuickDoc: external docs loaded: net.sergeych.lyngio.docs.ProcessBuiltinDocs.ensure() OK")
|
||||||
|
anyLoaded = true
|
||||||
|
} catch (_: Throwable) {}
|
||||||
|
|
||||||
|
if (!anyLoaded) {
|
||||||
// Seed a minimal plugin-local fallback so Path docs still work without lyngio
|
// Seed a minimal plugin-local fallback so Path docs still work without lyngio
|
||||||
val seeded = try {
|
val seeded = try {
|
||||||
FsDocsFallback.ensureOnce()
|
FsDocsFallback.ensureOnce()
|
||||||
|
ProcessDocsFallback.ensureOnce()
|
||||||
|
true
|
||||||
} catch (_: Throwable) { false }
|
} catch (_: Throwable) { false }
|
||||||
if (seeded) {
|
if (seeded) {
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found; seeded plugin fallback for lyng.io.fs")
|
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found; seeded plugin fallbacks")
|
||||||
} else {
|
} else {
|
||||||
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found (lyngio absent on classpath)")
|
log.info("[LYNG_DEBUG] QuickDoc: external docs NOT found (lyngio absent on classpath)")
|
||||||
}
|
}
|
||||||
seeded
|
return seeded
|
||||||
}
|
}
|
||||||
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun getCustomDocumentationElement(
|
override fun getCustomDocumentationElement(
|
||||||
@@ -498,24 +539,51 @@ 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)
|
||||||
if (d.mutable) "var ${d.name}${typeStr}" else "val ${d.name}${typeStr}"
|
if (d.mutable) "var ${d.name}${typeStr}" else "val ${d.name}${typeStr}"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Show full detailed documentation, not just the summary
|
|
||||||
val raw = d.doc?.raw
|
|
||||||
val doc: String? = if (raw.isNullOrBlank()) null else MarkdownRenderer.render(raw)
|
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
|
sb.append(renderDocBody(d.doc))
|
||||||
|
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()
|
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)}"
|
||||||
return "<div class='doc-title'>${htmlEscape(title)}</div>"
|
val sb = StringBuilder()
|
||||||
|
sb.append(renderTitle(title))
|
||||||
|
|
||||||
|
// Find matching @param tag
|
||||||
|
fn.doc?.tags?.get("param")?.forEach { tag ->
|
||||||
|
val parts = tag.split(Regex("\\s+"), 2)
|
||||||
|
if (parts.getOrNull(0) == p.name && parts.size > 1) {
|
||||||
|
sb.append(styledMarkdown(MarkdownRenderer.render(parts[1])))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun renderMemberFunDoc(className: String, m: MiniMemberFunDecl): String {
|
private fun renderMemberFunDoc(className: String, m: MiniMemberFunDecl): String {
|
||||||
@@ -526,11 +594,9 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val ret = typeOf(m.returnType)
|
val ret = typeOf(m.returnType)
|
||||||
val staticStr = if (m.isStatic) "static " else ""
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
val title = "${staticStr}method $className.${m.name}(${params})${ret}"
|
val title = "${staticStr}method $className.${m.name}(${params})${ret}"
|
||||||
val raw = m.doc?.raw
|
|
||||||
val doc: String? = if (raw.isNullOrBlank()) null else MarkdownRenderer.render(raw)
|
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
|
sb.append(renderDocBody(m.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -539,24 +605,34 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
val kind = if (m.mutable) "var" else "val"
|
val kind = if (m.mutable) "var" else "val"
|
||||||
val staticStr = if (m.isStatic) "static " else ""
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
val title = "${staticStr}${kind} $className.${m.name}${ts}"
|
val title = "${staticStr}${kind} $className.${m.name}${ts}"
|
||||||
val raw = m.doc?.raw
|
|
||||||
val doc: String? = if (raw.isNullOrBlank()) null else MarkdownRenderer.render(raw)
|
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>").append(htmlEscape(title)).append("</div>")
|
sb.append(renderTitle(title))
|
||||||
if (!doc.isNullOrBlank()) sb.append(styledMarkdown(doc))
|
sb.append(renderDocBody(m.doc))
|
||||||
return sb.toString()
|
return sb.toString()
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun typeOf(t: MiniTypeRef?): String = when (t) {
|
private fun renderMemberTypeAliasDoc(className: String, m: MiniMemberTypeAliasDecl): String {
|
||||||
is MiniTypeName -> ": ${t.segments.joinToString(".") { it.name }}${if (t.nullable) "?" else ""}"
|
val tp = if (m.typeParams.isEmpty()) "" else "<" + m.typeParams.joinToString(", ") + ">"
|
||||||
is MiniGenericType -> {
|
val body = typeOf(m.target)
|
||||||
val base = typeOf(t.base).removePrefix(": ")
|
val rhs = if (body.isBlank()) "" else " = ${body.removePrefix(": ")}"
|
||||||
val args = t.args.joinToString(", ") { typeOf(it).removePrefix(": ") }
|
val staticStr = if (m.isStatic) "static " else ""
|
||||||
": ${base}<${args}>${if (t.nullable) "?" else ""}"
|
val title = "${staticStr}type $className.${m.name}$tp$rhs"
|
||||||
}
|
val sb = StringBuilder()
|
||||||
is MiniFunctionType -> ": (..) -> ..${if (t.nullable) "?" else ""}"
|
sb.append(renderTitle(title))
|
||||||
is MiniTypeVar -> ": ${t.name}${if (t.nullable) "?" else ""}"
|
sb.append(renderDocBody(m.doc))
|
||||||
null -> ": Object?"
|
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 {
|
||||||
|
val s = DocLookupUtils.typeOf(t)
|
||||||
|
return if (s.isEmpty()) (if (t == null) ": Object?" else "") else ": $s"
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun signatureOf(fn: MiniFunDecl): String {
|
private fun signatureOf(fn: MiniFunDecl): String {
|
||||||
@@ -568,6 +644,10 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return "(${params})${ret}"
|
return "(${params})${ret}"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun renderTitle(title: String): String {
|
||||||
|
return "<div class='doc-title' style='margin-bottom: 0.8em;'>${htmlEscape(title)}</div>"
|
||||||
|
}
|
||||||
|
|
||||||
private fun htmlEscape(s: String): String = buildString(s.length) {
|
private fun htmlEscape(s: String): String = buildString(s.length) {
|
||||||
for (ch in s) append(
|
for (ch in s) append(
|
||||||
when (ch) {
|
when (ch) {
|
||||||
@@ -634,7 +714,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
|
|
||||||
private fun renderOverloads(name: String, overloads: List<MiniFunDecl>): String {
|
private fun renderOverloads(name: String, overloads: List<MiniFunDecl>): String {
|
||||||
val sb = StringBuilder()
|
val sb = StringBuilder()
|
||||||
sb.append("<div class='doc-title'>Overloads for ").append(htmlEscape(name)).append("</div>")
|
sb.append(renderTitle("Overloads for $name"))
|
||||||
sb.append("<ul>")
|
sb.append("<ul>")
|
||||||
overloads.forEach { fn ->
|
overloads.forEach { fn ->
|
||||||
sb.append("<li><code>")
|
sb.append("<li><code>")
|
||||||
@@ -656,6 +736,55 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
return if (e > s) TextRange(s, e) else null
|
return if (e > s) TextRange(s, e) else null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun renderDocBody(doc: MiniDoc?): String {
|
||||||
|
if (doc == null) return ""
|
||||||
|
val sb = StringBuilder()
|
||||||
|
if (doc.raw.isNotBlank()) {
|
||||||
|
sb.append(styledMarkdown(MarkdownRenderer.render(doc.raw)))
|
||||||
|
}
|
||||||
|
if (doc.tags.isNotEmpty()) {
|
||||||
|
sb.append(renderTags(doc.tags))
|
||||||
|
}
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun renderTags(tags: Map<String, List<String>>): String {
|
||||||
|
if (tags.isEmpty()) return ""
|
||||||
|
val sb = StringBuilder()
|
||||||
|
sb.append("<table class='sections'>")
|
||||||
|
|
||||||
|
fun section(title: String, list: List<String>, isKeyValue: Boolean = false) {
|
||||||
|
if (list.isEmpty()) return
|
||||||
|
sb.append("<tr><td valign='top' class='section'><p>").append(htmlEscape(title)).append(":</p></td><td valign='top'>")
|
||||||
|
list.forEachIndexed { index, item ->
|
||||||
|
if (index > 0) sb.append("<p>")
|
||||||
|
if (isKeyValue) {
|
||||||
|
val parts = item.split(Regex("\\s+"), 2)
|
||||||
|
sb.append("<code>").append(htmlEscape(parts[0])).append("</code>")
|
||||||
|
if (parts.size > 1) {
|
||||||
|
sb.append(" — ").append(MarkdownRenderer.render(parts[1]).removePrefix("<p>").removeSuffix("</p>"))
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
sb.append(MarkdownRenderer.render(item).removePrefix("<p>").removeSuffix("</p>"))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append("</td></tr>")
|
||||||
|
}
|
||||||
|
|
||||||
|
section("Parameters", tags["param"] ?: emptyList(), isKeyValue = true)
|
||||||
|
section("Returns", tags["return"] ?: emptyList())
|
||||||
|
section("Throws", tags["throws"] ?: emptyList(), isKeyValue = true)
|
||||||
|
|
||||||
|
tags.forEach { (name, list) ->
|
||||||
|
if (name !in listOf("param", "return", "throws")) {
|
||||||
|
section(name.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }, list)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
sb.append("</table>")
|
||||||
|
return sb.toString()
|
||||||
|
}
|
||||||
|
|
||||||
private fun previousWordBefore(text: String, offset: Int): TextRange? {
|
private fun previousWordBefore(text: String, offset: Int): TextRange? {
|
||||||
// skip spaces and the dot to the left, but stop after hitting a non-identifier boundary
|
// skip spaces and the dot to the left, but stop after hitting a non-identifier boundary
|
||||||
var i = (offset - 1).coerceAtLeast(0)
|
var i = (offset - 1).coerceAtLeast(0)
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Minimal fallback docs seeding for `lyng.io.process` used only inside the IDEA plugin
|
||||||
|
* when external docs module (lyngio) is not present on the classpath.
|
||||||
|
*/
|
||||||
|
package net.sergeych.lyng.idea.docs
|
||||||
|
|
||||||
|
import net.sergeych.lyng.miniast.BuiltinDocRegistry
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
|
internal object ProcessDocsFallback {
|
||||||
|
@Volatile
|
||||||
|
private var seeded = false
|
||||||
|
|
||||||
|
fun ensureOnce(): Boolean {
|
||||||
|
if (seeded) return true
|
||||||
|
synchronized(this) {
|
||||||
|
if (seeded) return true
|
||||||
|
BuiltinDocRegistry.module("lyng.io.process") {
|
||||||
|
classDoc(name = "Process", doc = "Process execution and control.") {
|
||||||
|
method(
|
||||||
|
name = "execute",
|
||||||
|
doc = "Execute a process with arguments.",
|
||||||
|
params = listOf(ParamDoc("executable", type("lyng.String")), ParamDoc("args", type("lyng.List"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "shell",
|
||||||
|
doc = "Execute a command via system shell.",
|
||||||
|
params = listOf(ParamDoc("command", type("lyng.String"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(name = "RunningProcess", doc = "Handle to a running process.") {
|
||||||
|
method(name = "stdout", doc = "Get standard output stream as a Flow of lines.", returns = type("lyng.Flow"))
|
||||||
|
method(name = "stderr", doc = "Get standard error stream as a Flow of lines.", returns = type("lyng.Flow"))
|
||||||
|
method(name = "waitFor", doc = "Wait for the process to exit.", returns = type("lyng.Int"))
|
||||||
|
method(name = "signal", doc = "Send a signal to the process.", params = listOf(ParamDoc("signal", type("lyng.String"))))
|
||||||
|
method(name = "destroy", doc = "Forcefully terminate the process.")
|
||||||
|
}
|
||||||
|
|
||||||
|
valDoc(name = "Process", doc = "Process execution and control.", type = type("Process"))
|
||||||
|
valDoc(name = "RunningProcess", doc = "Handle to a running process.", type = type("RunningProcess"))
|
||||||
|
}
|
||||||
|
seeded = true
|
||||||
|
return true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,43 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight quick-fix that adds a word to the per-project Lyng dictionary.
|
|
||||||
*/
|
|
||||||
class AddToLyngDictionaryFix(private val word: String) : IntentionAction {
|
|
||||||
override fun getText(): String = "Add '$word' to Lyng dictionary"
|
|
||||||
override fun getFamilyName(): String = "Lyng Spelling"
|
|
||||||
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean = word.isNotBlank()
|
|
||||||
override fun startInWriteAction(): Boolean = true
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(project)
|
|
||||||
val learned = settings.learnedWords
|
|
||||||
learned.add(word.lowercase())
|
|
||||||
settings.learnedWords = learned
|
|
||||||
// Restart daemon to refresh highlights
|
|
||||||
if (file != null) DaemonCodeAnalyzer.getInstance(project).restart(file)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,83 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.util.zip.GZIPInputStream
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Very simple English dictionary loader for offline suggestions on IC-243.
|
|
||||||
* It loads a word list from classpath resources. Supports plain text (one word per line)
|
|
||||||
* and gzipped text if the resource ends with .gz.
|
|
||||||
*/
|
|
||||||
object EnglishDictionary {
|
|
||||||
private val log = Logger.getInstance(EnglishDictionary::class.java)
|
|
||||||
|
|
||||||
@Volatile private var loaded = false
|
|
||||||
@Volatile private var words: Set<String> = emptySet()
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Load dictionary from bundled resources (once).
|
|
||||||
* If multiple candidates exist, the first found is used.
|
|
||||||
*/
|
|
||||||
private fun ensureLoaded() {
|
|
||||||
if (loaded) return
|
|
||||||
synchronized(this) {
|
|
||||||
if (loaded) return
|
|
||||||
val candidates = listOf(
|
|
||||||
// preferred large bundles first (add en-basic.txt.gz ~3–5MB here)
|
|
||||||
"/dictionaries/en-basic.txt.gz",
|
|
||||||
"/dictionaries/en-large.txt.gz",
|
|
||||||
// plain text fallbacks
|
|
||||||
"/dictionaries/en-basic.txt",
|
|
||||||
"/dictionaries/en-large.txt",
|
|
||||||
)
|
|
||||||
val merged = HashSet<String>(128_000)
|
|
||||||
for (res in candidates) {
|
|
||||||
try {
|
|
||||||
val stream = javaClass.getResourceAsStream(res) ?: continue
|
|
||||||
val reader = if (res.endsWith(".gz"))
|
|
||||||
BufferedReader(InputStreamReader(GZIPInputStream(stream)))
|
|
||||||
else
|
|
||||||
BufferedReader(InputStreamReader(stream))
|
|
||||||
var loadedCount = 0
|
|
||||||
reader.useLines { seq -> seq.forEach { line ->
|
|
||||||
val w = line.trim()
|
|
||||||
if (w.isNotEmpty() && !w.startsWith("#")) { merged += w.lowercase(); loadedCount++ }
|
|
||||||
} }
|
|
||||||
log.info("EnglishDictionary: loaded $loadedCount words from $res (total=${merged.size})")
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
log.info("EnglishDictionary: failed to load $res: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (merged.isEmpty()) {
|
|
||||||
// Fallback minimal set
|
|
||||||
merged += setOf("comment","comments","error","errors","found","file","not","word","words","count","value","name","class","function","string")
|
|
||||||
log.info("EnglishDictionary: using minimal built-in set (${merged.size})")
|
|
||||||
}
|
|
||||||
words = merged
|
|
||||||
loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun allWords(): Set<String> {
|
|
||||||
ensureLoaded()
|
|
||||||
return words
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,609 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 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.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Grazie-backed annotator for Lyng files.
|
|
||||||
*
|
|
||||||
* It consumes the MiniAst-driven LyngSpellIndex and, when Grazie is present,
|
|
||||||
* tries to run Grazie checks on the extracted TextContent. Results are painted
|
|
||||||
* as warnings in the editor. If the Grazie API changes, we use reflection and
|
|
||||||
* fail softly with INFO logs (no errors shown to users).
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.grazie.text.TextContent
|
|
||||||
import com.intellij.grazie.text.TextContent.TextDomain
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.lang.annotation.AnnotationHolder
|
|
||||||
import com.intellij.lang.annotation.ExternalAnnotator
|
|
||||||
import com.intellij.lang.annotation.HighlightSeverity
|
|
||||||
import com.intellij.openapi.application.ApplicationManager
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.editor.Document
|
|
||||||
import com.intellij.openapi.editor.colors.TextAttributesKey
|
|
||||||
import com.intellij.openapi.project.DumbAware
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
class LyngGrazieAnnotator : ExternalAnnotator<LyngGrazieAnnotator.Input, LyngGrazieAnnotator.Result>(), DumbAware {
|
|
||||||
private val log = Logger.getInstance(LyngGrazieAnnotator::class.java)
|
|
||||||
|
|
||||||
companion object {
|
|
||||||
// Cache GrammarChecker availability to avoid repeated reflection + noisy logs
|
|
||||||
@Volatile
|
|
||||||
private var grammarCheckerAvailable: Boolean? = null
|
|
||||||
|
|
||||||
@Volatile
|
|
||||||
private var grammarCheckerMissingLogged: Boolean = false
|
|
||||||
|
|
||||||
private fun isGrammarCheckerKnownMissing(): Boolean = (grammarCheckerAvailable == false)
|
|
||||||
|
|
||||||
private fun markGrammarCheckerMissingOnce(log: Logger, message: String) {
|
|
||||||
if (!grammarCheckerMissingLogged) {
|
|
||||||
// Downgrade to debug to reduce log noise across projects/sessions
|
|
||||||
log.debug(message)
|
|
||||||
grammarCheckerMissingLogged = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private val RETRY_KEY: Key<Long> = Key.create("LYNG_GRAZIE_ANN_RETRY_STAMP")
|
|
||||||
}
|
|
||||||
|
|
||||||
data class Input(val modStamp: Long)
|
|
||||||
data class Finding(val range: TextRange, val message: String)
|
|
||||||
data class Result(val modStamp: Long, val findings: List<Finding>)
|
|
||||||
|
|
||||||
override fun collectInformation(file: PsiFile): Input? {
|
|
||||||
val doc: Document = file.viewProvider.document ?: return null
|
|
||||||
// Only require Grazie presence; index readiness is checked in apply with a retry.
|
|
||||||
val grazie = isGrazieInstalled()
|
|
||||||
if (!grazie) {
|
|
||||||
log.info("LyngGrazieAnnotator.collectInformation: skip (grazie=false) file='${file.name}'")
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.collectInformation: file='${file.name}', modStamp=${doc.modificationStamp}")
|
|
||||||
return Input(doc.modificationStamp)
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun doAnnotate(collectedInfo: Input?): Result? {
|
|
||||||
// All heavy lifting is done in apply where we have the file context
|
|
||||||
return collectedInfo?.let { Result(it.modStamp, emptyList()) }
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun apply(file: PsiFile, annotationResult: Result?, holder: AnnotationHolder) {
|
|
||||||
if (annotationResult == null || !isGrazieInstalled()) return
|
|
||||||
val doc = file.viewProvider.document ?: return
|
|
||||||
val idx = LyngSpellIndex.getUpToDate(file) ?: run {
|
|
||||||
log.info("LyngGrazieAnnotator.apply: index not ready for '${file.name}', scheduling one-shot restart")
|
|
||||||
scheduleOneShotRestart(file, annotationResult.modStamp)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
|
|
||||||
// Build TextContent fragments for comments/strings/identifiers according to settings
|
|
||||||
val fragments = mutableListOf<Pair<TextContent, TextRange>>()
|
|
||||||
try {
|
|
||||||
fun addFragments(ranges: List<TextRange>, domain: TextDomain) {
|
|
||||||
for (r in ranges) {
|
|
||||||
val local = rangeToTextContent(file, domain, r) ?: continue
|
|
||||||
fragments += local to r
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Comments always via COMMENTS
|
|
||||||
addFragments(idx.comments, TextDomain.COMMENTS)
|
|
||||||
// Strings: LITERALS if requested, else COMMENTS if fallback enabled
|
|
||||||
if (settings.spellCheckStringLiterals) {
|
|
||||||
val domain = if (settings.grazieTreatLiteralsAsComments) TextDomain.COMMENTS else TextDomain.LITERALS
|
|
||||||
addFragments(idx.strings, domain)
|
|
||||||
}
|
|
||||||
// Identifiers via COMMENTS to force painting in 243 unless user disables fallback
|
|
||||||
val idsDomain = if (settings.grazieTreatIdentifiersAsComments) TextDomain.COMMENTS else TextDomain.DOCUMENTATION
|
|
||||||
addFragments(idx.identifiers, idsDomain)
|
|
||||||
log.info(
|
|
||||||
"LyngGrazieAnnotator.apply: file='${file.name}', idxCounts ids=${idx.identifiers.size}, comments=${idx.comments.size}, strings=${idx.strings.size}, builtFragments=${fragments.size}"
|
|
||||||
)
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: failed to build TextContent fragments: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
|
|
||||||
if (fragments.isEmpty()) return
|
|
||||||
|
|
||||||
val findings = mutableListOf<Finding>()
|
|
||||||
var totalReturned = 0
|
|
||||||
var chosenEntry: String? = null
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
try {
|
|
||||||
val (typos, entryNote) = runGrazieChecksWithTracing(file, content)
|
|
||||||
if (chosenEntry == null) chosenEntry = entryNote
|
|
||||||
if (typos != null) {
|
|
||||||
totalReturned += typos.size
|
|
||||||
for (t in typos) {
|
|
||||||
val rel = extractRangeFromTypo(t) ?: continue
|
|
||||||
// Map relative range inside fragment to host file range
|
|
||||||
val abs = TextRange(hostRange.startOffset + rel.startOffset, hostRange.startOffset + rel.endOffset)
|
|
||||||
findings += Finding(abs, extractMessageFromTypo(t) ?: "Spelling/Grammar")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: Grazie check failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.apply: used=${chosenEntry ?: "<none>"}, totalFindings=$totalReturned, painting=${findings.size}")
|
|
||||||
|
|
||||||
// IMPORTANT: Do NOT fallback to the tiny bundled vocabulary on modern IDEs.
|
|
||||||
// If Grazie/Natural Languages processing returned nothing, we simply exit here
|
|
||||||
// to avoid low‑quality results from the legacy dictionary.
|
|
||||||
if (findings.isEmpty()) return
|
|
||||||
|
|
||||||
for (f in findings) {
|
|
||||||
val ab = holder.newAnnotation(HighlightSeverity.INFORMATION, f.message).range(f.range)
|
|
||||||
applyTypoStyleIfRequested(file, ab)
|
|
||||||
ab.create()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun scheduleOneShotRestart(file: PsiFile, modStamp: Long) {
|
|
||||||
try {
|
|
||||||
val last = file.getUserData(RETRY_KEY)
|
|
||||||
if (last == modStamp) {
|
|
||||||
log.info("LyngGrazieAnnotator.restart: already retried for modStamp=$modStamp, skip")
|
|
||||||
return
|
|
||||||
}
|
|
||||||
file.putUserData(RETRY_KEY, modStamp)
|
|
||||||
ApplicationManager.getApplication().invokeLater({
|
|
||||||
try {
|
|
||||||
DaemonCodeAnalyzer.getInstance(file.project).restart(file)
|
|
||||||
log.info("LyngGrazieAnnotator.restart: daemon restarted for '${file.name}'")
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator.restart failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
})
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator.scheduleOneShotRestart failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun isGrazieInstalled(): Boolean {
|
|
||||||
return PluginManagerCore.isPluginInstalled(com.intellij.openapi.extensions.PluginId.getId("com.intellij.grazie")) ||
|
|
||||||
PluginManagerCore.isPluginInstalled(com.intellij.openapi.extensions.PluginId.getId("tanvd.grazi"))
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun rangeToTextContent(file: PsiFile, domain: TextDomain, range: TextRange): TextContent? {
|
|
||||||
// Build TextContent via reflection: prefer psiFragment(domain, element)
|
|
||||||
return try {
|
|
||||||
// Try to find an element that fully covers the target range
|
|
||||||
var element = file.findElementAt(range.startOffset) ?: return null
|
|
||||||
val start = range.startOffset
|
|
||||||
val end = range.endOffset
|
|
||||||
while (element.parent != null && (element.textRange.startOffset > start || element.textRange.endOffset < end)) {
|
|
||||||
element = element.parent
|
|
||||||
}
|
|
||||||
if (element.textRange.startOffset > start || element.textRange.endOffset < end) return null
|
|
||||||
// In many cases, the element may not span the whole range; use file + range via suitable factory
|
|
||||||
val methods = TextContent::class.java.methods.filter { it.name == "psiFragment" }
|
|
||||||
val byElementDomain = methods.firstOrNull { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("PsiElement") }
|
|
||||||
if (byElementDomain != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return (byElementDomain.invoke(null, element, domain) as? TextContent)?.let { tc ->
|
|
||||||
val relStart = start - element.textRange.startOffset
|
|
||||||
val relEnd = end - element.textRange.startOffset
|
|
||||||
if (relStart < 0 || relEnd > tc.length || relStart >= relEnd) return null
|
|
||||||
tc.subText(TextRange(relStart, relEnd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
val byDomainElement = methods.firstOrNull { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") }
|
|
||||||
if (byDomainElement != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
return (byDomainElement.invoke(null, domain, element) as? TextContent)?.let { tc ->
|
|
||||||
val relStart = start - element.textRange.startOffset
|
|
||||||
val relEnd = end - element.textRange.startOffset
|
|
||||||
if (relStart < 0 || relEnd > tc.length || relStart >= relEnd) return null
|
|
||||||
tc.subText(TextRange(relStart, relEnd))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
null
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: rangeToTextContent failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun runGrazieChecksWithTracing(file: PsiFile, content: TextContent): Pair<Collection<Any>?, String?> {
|
|
||||||
// Try known entry points via reflection to avoid hard dependencies on Grazie internals
|
|
||||||
if (isGrammarCheckerKnownMissing()) return null to null
|
|
||||||
try {
|
|
||||||
// 1) Static GrammarChecker.check(TextContent)
|
|
||||||
val checkerCls = try {
|
|
||||||
Class.forName("com.intellij.grazie.grammar.GrammarChecker").also { grammarCheckerAvailable = true }
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
grammarCheckerAvailable = false
|
|
||||||
markGrammarCheckerMissingOnce(log, "LyngGrazieAnnotator: GrammarChecker class not found: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
null
|
|
||||||
}
|
|
||||||
if (checkerCls != null) {
|
|
||||||
// Diagnostic: list available 'check' methods once
|
|
||||||
runCatching {
|
|
||||||
val checks = checkerCls.methods.filter { it.name == "check" }
|
|
||||||
val sig = checks.joinToString { m ->
|
|
||||||
val params = m.parameterTypes.joinToString(prefix = "(", postfix = ")") { it.simpleName }
|
|
||||||
"${m.name}$params static=${java.lang.reflect.Modifier.isStatic(m.modifiers)}"
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator: GrammarChecker.check candidates: ${if (sig.isEmpty()) "<none>" else sig}")
|
|
||||||
}
|
|
||||||
checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }?.let { m ->
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.check(TextContent) static"
|
|
||||||
}
|
|
||||||
// 2) GrammarChecker.getInstance().check(TextContent)
|
|
||||||
val getInstance = checkerCls.methods.firstOrNull { it.name == "getInstance" && it.parameterCount == 0 }
|
|
||||||
val inst = getInstance?.invoke(null)
|
|
||||||
if (inst != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(inst, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.getInstance().check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 3) GrammarChecker.getDefault().check(TextContent)
|
|
||||||
val getDefault = checkerCls.methods.firstOrNull { it.name == "getDefault" && it.parameterCount == 0 }
|
|
||||||
val def = getDefault?.invoke(null)
|
|
||||||
if (def != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(def, content) as? Collection<Any>
|
|
||||||
return res to "GrammarChecker.getDefault().check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 4) Service from project/application: GrammarChecker as a service
|
|
||||||
runCatching {
|
|
||||||
val app = com.intellij.openapi.application.ApplicationManager.getApplication()
|
|
||||||
val getService = app::class.java.methods.firstOrNull { it.name == "getService" && it.parameterCount == 1 }
|
|
||||||
val svc = getService?.invoke(app, checkerCls)
|
|
||||||
if (svc != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(svc, content) as? Collection<Any>
|
|
||||||
if (res != null) return res to "Application.getService(GrammarChecker).check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
runCatching {
|
|
||||||
val getService = file.project::class.java.methods.firstOrNull { it.name == "getService" && it.parameterCount == 1 }
|
|
||||||
val svc = getService?.invoke(file.project, checkerCls)
|
|
||||||
if (svc != null) {
|
|
||||||
val m = checkerCls.methods.firstOrNull { it.name == "check" && it.parameterCount == 1 && it.parameterTypes[0].name.endsWith("TextContent") }
|
|
||||||
if (m != null) {
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(svc, content) as? Collection<Any>
|
|
||||||
if (res != null) return res to "Project.getService(GrammarChecker).check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 5) Fallback: search any public method named check that accepts TextContent in any Grazie class (static)
|
|
||||||
val candidateClasses = listOf(
|
|
||||||
"com.intellij.grazie.grammar.GrammarChecker",
|
|
||||||
"com.intellij.grazie.grammar.GrammarRunner",
|
|
||||||
"com.intellij.grazie.grammar.Grammar" // historical names
|
|
||||||
)
|
|
||||||
for (cn in candidateClasses) {
|
|
||||||
val cls = try { Class.forName(cn) } catch (_: Throwable) { continue }
|
|
||||||
val m = cls.methods.firstOrNull { it.name == "check" && it.parameterTypes.any { p -> p.name.endsWith("TextContent") } }
|
|
||||||
if (m != null) {
|
|
||||||
val args = arrayOfNulls<Any>(m.parameterCount)
|
|
||||||
// place content to the first TextContent parameter; others left null (common defaults)
|
|
||||||
for (i in 0 until m.parameterCount) if (m.parameterTypes[i].name.endsWith("TextContent")) { args[i] = content; break }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, *args) as? Collection<Any>
|
|
||||||
if (res != null) return res to "$cn.${m.name}(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// 6) Kotlin top-level function: GrammarCheckerKt.check(TextContent)
|
|
||||||
runCatching {
|
|
||||||
val kt = Class.forName("com.intellij.grazie.grammar.GrammarCheckerKt")
|
|
||||||
val m = kt.methods.firstOrNull { it.name == "check" && it.parameterTypes.any { p -> p.name.endsWith("TextContent") } }
|
|
||||||
if (m != null) {
|
|
||||||
val args = arrayOfNulls<Any>(m.parameterCount)
|
|
||||||
for (i in 0 until m.parameterCount) if (m.parameterTypes[i].name.endsWith("TextContent")) { args[i] = content; break }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
val res = m.invoke(null, *args) as? Collection<Any>
|
|
||||||
if (res != null) return res to "GrammarCheckerKt.check(TextContent)"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngGrazieAnnotator: runGrazieChecks reflection failed: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
}
|
|
||||||
return null to null
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun extractRangeFromTypo(typo: Any): TextRange? {
|
|
||||||
// Try to get a relative range from returned Grazie issue/typo via common accessors
|
|
||||||
return try {
|
|
||||||
// Common getters
|
|
||||||
val m1 = typo.javaClass.methods.firstOrNull { it.name == "getRange" && it.parameterCount == 0 }
|
|
||||||
val r1 = if (m1 != null) m1.invoke(typo) else null
|
|
||||||
when (r1) {
|
|
||||||
is TextRange -> return r1
|
|
||||||
is IntRange -> return TextRange(r1.first, r1.last + 1)
|
|
||||||
}
|
|
||||||
val m2 = typo.javaClass.methods.firstOrNull { it.name == "getHighlightRange" && it.parameterCount == 0 }
|
|
||||||
val r2 = if (m2 != null) m2.invoke(typo) else null
|
|
||||||
when (r2) {
|
|
||||||
is TextRange -> return r2
|
|
||||||
is IntRange -> return TextRange(r2.first, r2.last + 1)
|
|
||||||
}
|
|
||||||
// Separate from/to ints
|
|
||||||
val fromM = typo.javaClass.methods.firstOrNull { it.name == "getFrom" && it.parameterCount == 0 && it.returnType == Int::class.javaPrimitiveType }
|
|
||||||
val toM = typo.javaClass.methods.firstOrNull { it.name == "getTo" && it.parameterCount == 0 && it.returnType == Int::class.javaPrimitiveType }
|
|
||||||
if (fromM != null && toM != null) {
|
|
||||||
val s = (fromM.invoke(typo) as? Int) ?: return null
|
|
||||||
val e = (toM.invoke(typo) as? Int) ?: return null
|
|
||||||
if (e > s) return TextRange(s, e)
|
|
||||||
}
|
|
||||||
null
|
|
||||||
} catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun extractMessageFromTypo(typo: Any): String? {
|
|
||||||
return try {
|
|
||||||
val m = typo.javaClass.methods.firstOrNull { it.name == "getMessage" && it.parameterCount == 0 }
|
|
||||||
(m?.invoke(typo) as? String)
|
|
||||||
} catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
// Fallback that uses legacy SpellCheckerManager (if present) via reflection to validate words in fragments.
|
|
||||||
// Returns number of warnings painted.
|
|
||||||
private fun fallbackWithLegacySpellcheckerIfAvailable(
|
|
||||||
file: PsiFile,
|
|
||||||
fragments: List<Pair<TextContent, TextRange>>,
|
|
||||||
holder: AnnotationHolder
|
|
||||||
): Int {
|
|
||||||
return try {
|
|
||||||
val mgrCls = Class.forName("com.intellij.spellchecker.SpellCheckerManager")
|
|
||||||
val getInstance = mgrCls.methods.firstOrNull { it.name == "getInstance" && it.parameterCount == 1 }
|
|
||||||
val isCorrect = mgrCls.methods.firstOrNull { it.name == "isCorrect" && it.parameterCount == 1 && it.parameterTypes[0] == String::class.java }
|
|
||||||
if (getInstance == null || isCorrect == null) {
|
|
||||||
// No legacy spellchecker API available — fall back to naive painter
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
val mgr = getInstance.invoke(null, file.project)
|
|
||||||
if (mgr == null) {
|
|
||||||
// Legacy manager not present for this project — use naive fallback
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
var painted = 0
|
|
||||||
val docText = file.viewProvider.document?.text ?: return 0
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
val text = try { docText.substring(hostRange.startOffset, hostRange.endOffset) } catch (_: Throwable) { null } ?: continue
|
|
||||||
var seen = 0
|
|
||||||
var flagged = 0
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val token = m.value
|
|
||||||
if ('%' in token) continue // skip printf fragments defensively
|
|
||||||
// Split snake_case and camelCase within the token
|
|
||||||
val parts = splitIdentifier(token)
|
|
||||||
for (part in parts) {
|
|
||||||
if (part.length <= 2) continue
|
|
||||||
if (isAllowedWord(part)) continue
|
|
||||||
// Quick allowlist for very common words to reduce noise if dictionaries differ
|
|
||||||
val ok = try { isCorrect.invoke(mgr, part) as? Boolean } catch (_: Throwable) { null }
|
|
||||||
if (ok == false) {
|
|
||||||
// Map part back to original token occurrence within this hostRange
|
|
||||||
val localStart = m.range.first + token.indexOf(part)
|
|
||||||
val localEnd = localStart + part.length
|
|
||||||
val abs = TextRange(hostRange.startOffset + localStart, hostRange.startOffset + localEnd)
|
|
||||||
paintTypoAnnotation(file, holder, abs, part)
|
|
||||||
painted++
|
|
||||||
flagged++
|
|
||||||
}
|
|
||||||
seen++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.fallback: fragment words=$seen, flagged=$flagged")
|
|
||||||
}
|
|
||||||
painted
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// If legacy manager is not available, fall back to a very naive heuristic (no external deps)
|
|
||||||
return naiveFallbackPaint(file, fragments, holder)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun naiveFallbackPaint(
|
|
||||||
file: PsiFile,
|
|
||||||
fragments: List<Pair<TextContent, TextRange>>,
|
|
||||||
holder: AnnotationHolder
|
|
||||||
): Int {
|
|
||||||
var painted = 0
|
|
||||||
val docText = file.viewProvider.document?.text
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
val baseWords = setOf(
|
|
||||||
// small, common vocabulary to catch near-miss typos in typical code/comments
|
|
||||||
"comment","comments","error","errors","found","file","not","word","words","count","value","name","class","function","string"
|
|
||||||
)
|
|
||||||
for ((content, hostRange) in fragments) {
|
|
||||||
val text: String? = docText?.let { dt ->
|
|
||||||
try { dt.substring(hostRange.startOffset, hostRange.endOffset) } catch (_: Throwable) { null }
|
|
||||||
}
|
|
||||||
if (text.isNullOrBlank()) continue
|
|
||||||
var seen = 0
|
|
||||||
var flagged = 0
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val token = m.value
|
|
||||||
if ('%' in token) continue
|
|
||||||
val parts = splitIdentifier(token)
|
|
||||||
for (part in parts) {
|
|
||||||
seen++
|
|
||||||
val lower = part.lowercase()
|
|
||||||
if (lower.length <= 2 || isAllowedWord(part)) continue
|
|
||||||
// Heuristic: no vowels OR 3 repeated chars OR ends with unlikely double consonants
|
|
||||||
val noVowel = lower.none { it in "aeiouy" }
|
|
||||||
val triple = Regex("(.)\\1\\1").containsMatchIn(lower)
|
|
||||||
val dblCons = Regex("[bcdfghjklmnpqrstvwxyz]{2}$").containsMatchIn(lower)
|
|
||||||
var looksWrong = noVowel || triple || dblCons
|
|
||||||
// Additional: low vowel ratio for length>=4
|
|
||||||
if (!looksWrong && lower.length >= 4) {
|
|
||||||
val vowels = lower.count { it in "aeiouy" }
|
|
||||||
val ratio = if (lower.isNotEmpty()) vowels.toDouble() / lower.length else 1.0
|
|
||||||
if (ratio < 0.25) looksWrong = true
|
|
||||||
}
|
|
||||||
// Additional: near-miss to a small base vocabulary (edit distance 1, or 2 for words >=6)
|
|
||||||
if (!looksWrong) {
|
|
||||||
for (bw in baseWords) {
|
|
||||||
val d = editDistance(lower, bw)
|
|
||||||
if (d == 1 || (d == 2 && lower.length >= 6)) { looksWrong = true; break }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (looksWrong) {
|
|
||||||
val localStart = m.range.first + token.indexOf(part)
|
|
||||||
val localEnd = localStart + part.length
|
|
||||||
val abs = TextRange(hostRange.startOffset + localStart, hostRange.startOffset + localEnd)
|
|
||||||
paintTypoAnnotation(file, holder, abs, part)
|
|
||||||
painted++
|
|
||||||
flagged++
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
log.info("LyngGrazieAnnotator.fallback(naive): fragment words=$seen, flagged=$flagged")
|
|
||||||
}
|
|
||||||
return painted
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun paintTypoAnnotation(file: PsiFile, holder: AnnotationHolder, range: TextRange, word: String) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
val ab = holder.newAnnotation(HighlightSeverity.INFORMATION, "Possible typo")
|
|
||||||
.range(range)
|
|
||||||
applyTypoStyleIfRequested(file, ab)
|
|
||||||
if (settings.offerLyngTypoQuickFixes) {
|
|
||||||
// Offer lightweight fixes; for 243 provide Add-to-dictionary always
|
|
||||||
ab.withFix(net.sergeych.lyng.idea.grazie.AddToLyngDictionaryFix(word))
|
|
||||||
// Offer "Replace with…" candidates (top 7)
|
|
||||||
val cands = suggestReplacements(file, word).take(7)
|
|
||||||
for (c in cands) {
|
|
||||||
ab.withFix(net.sergeych.lyng.idea.grazie.ReplaceWordFix(range, word, c))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
ab.create()
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun applyTypoStyleIfRequested(file: PsiFile, ab: com.intellij.lang.annotation.AnnotationBuilder) {
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
if (!settings.showTyposWithGreenUnderline) return
|
|
||||||
// Use the standard TYPO text attributes key used by the platform
|
|
||||||
val TYPO: TextAttributesKey = TextAttributesKey.createTextAttributesKey("TYPO")
|
|
||||||
try {
|
|
||||||
ab.textAttributes(TYPO)
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
// some IDEs may not allow setting attributes on INFORMATION; ignore gracefully
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun suggestReplacements(file: PsiFile, word: String): List<String> {
|
|
||||||
val lower = word.lowercase()
|
|
||||||
val fromProject = collectProjectWords(file)
|
|
||||||
val fromTech = TechDictionary.allWords()
|
|
||||||
val fromEnglish = EnglishDictionary.allWords()
|
|
||||||
// Merge with priority: project (p=0), tech (p=1), english (p=2)
|
|
||||||
val all = LinkedHashSet<String>()
|
|
||||||
all.addAll(fromProject)
|
|
||||||
all.addAll(fromTech)
|
|
||||||
all.addAll(fromEnglish)
|
|
||||||
data class Cand(val w: String, val d: Int, val p: Int)
|
|
||||||
val cands = ArrayList<Cand>(32)
|
|
||||||
for (w in all) {
|
|
||||||
if (w == lower) continue
|
|
||||||
if (kotlin.math.abs(w.length - lower.length) > 2) continue
|
|
||||||
val d = editDistance(lower, w)
|
|
||||||
val p = when {
|
|
||||||
w in fromProject -> 0
|
|
||||||
w in fromTech -> 1
|
|
||||||
else -> 2
|
|
||||||
}
|
|
||||||
cands += Cand(w, d, p)
|
|
||||||
}
|
|
||||||
cands.sortWith(compareBy<Cand> { it.d }.thenBy { it.p }.thenBy { it.w })
|
|
||||||
// Return a larger pool so callers can choose desired display count
|
|
||||||
return cands.take(16).map { it.w }
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun collectProjectWords(file: PsiFile): Set<String> {
|
|
||||||
// Simple approach: use current file text; can be extended to project scanning later
|
|
||||||
val text = file.viewProvider.document?.text ?: return emptySet()
|
|
||||||
val out = LinkedHashSet<String>()
|
|
||||||
val tokenRegex = Regex("[A-Za-z][A-Za-z0-9_']{2,}")
|
|
||||||
for (m in tokenRegex.findAll(text)) {
|
|
||||||
val parts = splitIdentifier(m.value)
|
|
||||||
parts.forEach { out += it.lowercase() }
|
|
||||||
}
|
|
||||||
// Include learned words
|
|
||||||
val settings = LyngFormatterSettings.getInstance(file.project)
|
|
||||||
out.addAll(settings.learnedWords.map { it.lowercase() })
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun splitIdentifier(token: String): List<String> {
|
|
||||||
// Split on underscores and camelCase boundaries
|
|
||||||
val unders = token.split('_').filter { it.isNotBlank() }
|
|
||||||
val out = mutableListOf<String>()
|
|
||||||
val camelBoundary = Regex("(?<=[a-z])(?=[A-Z])")
|
|
||||||
for (u in unders) out += u.split(camelBoundary).filter { it.isNotBlank() }
|
|
||||||
return out
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun isAllowedWord(w: String): Boolean {
|
|
||||||
val s = w.lowercase()
|
|
||||||
return s in setOf(
|
|
||||||
// common code words / language keywords to avoid noise
|
|
||||||
"val","var","fun","class","interface","enum","type","import","package","return","if","else","when","while","for","try","catch","finally","true","false","null",
|
|
||||||
"abstract","closed","override",
|
|
||||||
// very common English words
|
|
||||||
"the","and","or","not","with","from","into","this","that","file","found","count","name","value","object"
|
|
||||||
)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun editDistance(a: String, b: String): Int {
|
|
||||||
if (a == b) return 0
|
|
||||||
if (a.isEmpty()) return b.length
|
|
||||||
if (b.isEmpty()) return a.length
|
|
||||||
val dp = IntArray(b.length + 1) { it }
|
|
||||||
for (i in 1..a.length) {
|
|
||||||
var prev = dp[0]
|
|
||||||
dp[0] = i
|
|
||||||
for (j in 1..b.length) {
|
|
||||||
val temp = dp[j]
|
|
||||||
dp[j] = minOf(
|
|
||||||
dp[j] + 1, // deletion
|
|
||||||
dp[j - 1] + 1, // insertion
|
|
||||||
prev + if (a[i - 1] == b[j - 1]) 0 else 1 // substitution
|
|
||||||
)
|
|
||||||
prev = temp
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return dp[b.length]
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,139 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.grazie.grammar.strategy.GrammarCheckingStrategy
|
|
||||||
import com.intellij.grazie.grammar.strategy.GrammarCheckingStrategy.TextDomain
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.extensions.PluginId
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiElement
|
|
||||||
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Grazie/Natural Languages strategy for Lyng.
|
|
||||||
*
|
|
||||||
* - Comments: checked as natural language (TextDomain.COMMENTS)
|
|
||||||
* - String literals: optionally checked (setting), skipping printf-like specifiers via stealth ranges (TextDomain.LITERALS)
|
|
||||||
* - Identifiers (non-keywords): checked under TextDomain.CODE so "Process code" controls apply
|
|
||||||
* - Keywords: skipped
|
|
||||||
*/
|
|
||||||
class LyngGrazieStrategy : GrammarCheckingStrategy {
|
|
||||||
|
|
||||||
private val log = Logger.getInstance(LyngGrazieStrategy::class.java)
|
|
||||||
@Volatile private var loggedOnce = false
|
|
||||||
@Volatile private var loggedFirstMatch = false
|
|
||||||
private val seenTypes: MutableSet<String> = java.util.Collections.synchronizedSet(mutableSetOf())
|
|
||||||
|
|
||||||
private fun legacySpellcheckerInstalled(): Boolean =
|
|
||||||
PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.spellchecker"))
|
|
||||||
|
|
||||||
// Regex for printf-style specifiers: %[flags][width][.precision][length]type
|
|
||||||
private val spec = Regex("%(?:[-+ #0]*(?:\\d+)?(?:\\.\\d+)?[a-zA-Z%])")
|
|
||||||
|
|
||||||
override fun isMyContextRoot(element: PsiElement): Boolean {
|
|
||||||
val type = element.node?.elementType
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
val legacyPresent = legacySpellcheckerInstalled()
|
|
||||||
if (type != null && seenTypes.size < 10) {
|
|
||||||
val name = type.toString()
|
|
||||||
if (seenTypes.add(name)) {
|
|
||||||
log.info("LyngGrazieStrategy: saw PSI type=$name")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngGrazieStrategy activated: legacyPresent=$legacyPresent, preferGrazieForCommentsAndLiterals=${settings.preferGrazieForCommentsAndLiterals}, spellCheckStringLiterals=${settings.spellCheckStringLiterals}, grazieChecksIdentifiers=${settings.grazieChecksIdentifiers}")
|
|
||||||
}
|
|
||||||
|
|
||||||
val file = element.containingFile ?: return false
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file) ?: return false // Suspend until ready
|
|
||||||
// To ensure Grazie asks TextExtractor for all leafs, accept any Lyng element once index is ready.
|
|
||||||
// The extractor will decide per-range/domain what to actually provide.
|
|
||||||
if (!loggedFirstMatch) {
|
|
||||||
loggedFirstMatch = true
|
|
||||||
log.info("LyngGrazieStrategy: enabling Grazie on all Lyng elements (index ready)")
|
|
||||||
}
|
|
||||||
return true
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun getContextRootTextDomain(root: PsiElement): TextDomain {
|
|
||||||
val type = root.node?.elementType
|
|
||||||
val settings = LyngFormatterSettings.getInstance(root.project)
|
|
||||||
val file = root.containingFile
|
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
|
||||||
val r = root.textRange
|
|
||||||
|
|
||||||
fun overlaps(list: List<TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
|
||||||
|
|
||||||
return when (type) {
|
|
||||||
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
|
||||||
LyngTokenTypes.STRING -> if (settings.grazieTreatLiteralsAsComments) TextDomain.COMMENTS else TextDomain.LITERALS
|
|
||||||
LyngTokenTypes.IDENTIFIER -> {
|
|
||||||
// For Grazie-only reliability in 243, route identifiers via COMMENTS when configured
|
|
||||||
if (settings.grazieTreatIdentifiersAsComments && index != null && r != null && overlaps(index.identifiers))
|
|
||||||
TextDomain.COMMENTS
|
|
||||||
else TextDomain.PLAIN_TEXT
|
|
||||||
}
|
|
||||||
else -> TextDomain.PLAIN_TEXT
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// Note: do not override getLanguageSupport to keep compatibility with 243 API
|
|
||||||
|
|
||||||
override fun getStealthyRanges(root: PsiElement, text: CharSequence): java.util.LinkedHashSet<IntRange> {
|
|
||||||
val result = LinkedHashSet<IntRange>()
|
|
||||||
val type = root.node?.elementType
|
|
||||||
if (type == LyngTokenTypes.STRING) {
|
|
||||||
if (!shouldCheckLiterals(root)) {
|
|
||||||
// Hide the entire string when literals checking is disabled by settings
|
|
||||||
result += (0 until text.length)
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
// Hide printf-like specifiers in strings
|
|
||||||
val (start, end) = stripQuotesBounds(text)
|
|
||||||
if (end > start) {
|
|
||||||
val content = text.subSequence(start, end)
|
|
||||||
for (m in spec.findAll(content)) {
|
|
||||||
val ms = start + m.range.first
|
|
||||||
val me = start + m.range.last
|
|
||||||
result += (ms..me)
|
|
||||||
}
|
|
||||||
if (result.isNotEmpty()) {
|
|
||||||
log.debug("LyngGrazieStrategy: hidden ${result.size} printf specifier ranges in string literal")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return result
|
|
||||||
}
|
|
||||||
|
|
||||||
override fun isEnabledByDefault(): Boolean = true
|
|
||||||
|
|
||||||
private fun shouldCheckLiterals(root: PsiElement): Boolean =
|
|
||||||
LyngFormatterSettings.getInstance(root.project).spellCheckStringLiterals
|
|
||||||
|
|
||||||
private fun stripQuotesBounds(text: CharSequence): Pair<Int, Int> {
|
|
||||||
if (text.length < 2) return 0 to text.length
|
|
||||||
val first = text.first()
|
|
||||||
val last = text.last()
|
|
||||||
return if ((first == '"' && last == '"') || (first == '\'' && last == '\''))
|
|
||||||
1 to (text.length - 1) else (0 to text.length)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -19,86 +19,29 @@ package net.sergeych.lyng.idea.grazie
|
|||||||
import com.intellij.grazie.text.TextContent
|
import com.intellij.grazie.text.TextContent
|
||||||
import com.intellij.grazie.text.TextContent.TextDomain
|
import com.intellij.grazie.text.TextContent.TextDomain
|
||||||
import com.intellij.grazie.text.TextExtractor
|
import com.intellij.grazie.text.TextExtractor
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
import net.sergeych.lyng.idea.psi.LyngElementTypes
|
||||||
import net.sergeych.lyng.idea.spell.LyngSpellIndex
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Provides Grazie with extractable text for Lyng PSI elements.
|
* Simplified TextExtractor for Lyng.
|
||||||
* We return text for identifiers, comments, and (optionally) string literals.
|
* Designates areas for Natural Languages (Grazie) to check.
|
||||||
* printf-like specifiers are filtered by the Grammar strategy via stealth ranges.
|
|
||||||
*/
|
*/
|
||||||
class LyngTextExtractor : TextExtractor() {
|
class LyngTextExtractor : TextExtractor() {
|
||||||
private val log = Logger.getInstance(LyngTextExtractor::class.java)
|
|
||||||
@Volatile private var loggedOnce = false
|
|
||||||
private val seen: MutableSet<String> = java.util.Collections.synchronizedSet(mutableSetOf())
|
|
||||||
|
|
||||||
override fun buildTextContent(element: PsiElement, allowedDomains: Set<TextDomain>): TextContent? {
|
override fun buildTextContent(element: PsiElement, allowedDomains: Set<TextDomain>): TextContent? {
|
||||||
val type = element.node?.elementType ?: return null
|
val type = element.node?.elementType ?: return null
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
val domain = when (type) {
|
||||||
log.info("LyngTextExtractor active; allowedDomains=${allowedDomains.joinToString()}")
|
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
||||||
}
|
LyngTokenTypes.STRING -> TextDomain.LITERALS
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
val file = element.containingFile
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TextDomain.COMMENTS
|
||||||
val r = element.textRange
|
else -> return null
|
||||||
|
|
||||||
fun overlaps(list: List<com.intellij.openapi.util.TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
|
||||||
|
|
||||||
// Decide target domain by intersection with our MiniAst-driven index; prefer comments > strings > identifiers
|
|
||||||
var domain: TextDomain? = null
|
|
||||||
if (index != null && r != null) {
|
|
||||||
if (overlaps(index.comments)) domain = TextDomain.COMMENTS
|
|
||||||
else if (overlaps(index.strings) && settings.spellCheckStringLiterals) domain = TextDomain.LITERALS
|
|
||||||
else if (overlaps(index.identifiers)) domain = if (settings.grazieTreatIdentifiersAsComments) TextDomain.COMMENTS else TextDomain.DOCUMENTATION
|
|
||||||
} else {
|
|
||||||
// Fallback to token type if index is not ready (rare timing), mostly for comments
|
|
||||||
domain = when (type) {
|
|
||||||
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (domain == null) return null
|
|
||||||
|
|
||||||
// If literals aren't requested but fallback is enabled, route strings as COMMENTS
|
|
||||||
if (domain == TextDomain.LITERALS && !allowedDomains.contains(TextDomain.LITERALS) && settings.grazieTreatLiteralsAsComments) {
|
|
||||||
domain = TextDomain.COMMENTS
|
|
||||||
}
|
|
||||||
if (!allowedDomains.contains(domain)) {
|
|
||||||
if (seen.add("deny-${domain.name}")) {
|
|
||||||
log.info("LyngTextExtractor: domain ${domain.name} not in allowedDomains; skipping")
|
|
||||||
}
|
|
||||||
return null
|
|
||||||
}
|
|
||||||
return try {
|
|
||||||
// Try common factory names across versions
|
|
||||||
val methods = TextContent::class.java.methods.filter { it.name == "psiFragment" }
|
|
||||||
val built: TextContent? = when {
|
|
||||||
// Try psiFragment(PsiElement, TextDomain)
|
|
||||||
methods.any { it.parameterCount == 2 && it.parameterTypes[0].name.contains("PsiElement") } -> {
|
|
||||||
val m = methods.first { it.parameterCount == 2 && it.parameterTypes[0].name.contains("PsiElement") }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
(m.invoke(null, element, domain) as? TextContent)?.also {
|
|
||||||
if (seen.add("ok-${domain.name}")) log.info("LyngTextExtractor: provided ${domain.name} for ${type} via psiFragment(element, domain)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Try psiFragment(TextDomain, PsiElement)
|
|
||||||
methods.any { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") } -> {
|
|
||||||
val m = methods.first { it.parameterCount == 2 && it.parameterTypes[0].name.endsWith("TextDomain") }
|
|
||||||
@Suppress("UNCHECKED_CAST")
|
|
||||||
(m.invoke(null, domain, element) as? TextContent)?.also {
|
|
||||||
if (seen.add("ok-${domain.name}")) log.info("LyngTextExtractor: provided ${domain.name} for ${type} via psiFragment(domain, element)")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
else -> null
|
|
||||||
}
|
|
||||||
built
|
|
||||||
} catch (e: Throwable) {
|
|
||||||
log.info("LyngTextExtractor: failed to build TextContent: ${e.javaClass.simpleName}: ${e.message}")
|
|
||||||
null
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if (!allowedDomains.contains(domain)) return null
|
||||||
|
|
||||||
|
return TextContent.psiFragment(domain, element)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,86 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.codeInsight.daemon.DaemonCodeAnalyzer
|
|
||||||
import com.intellij.codeInsight.intention.IntentionAction
|
|
||||||
import com.intellij.openapi.command.WriteCommandAction
|
|
||||||
import com.intellij.openapi.editor.CaretModel
|
|
||||||
import com.intellij.openapi.editor.Document
|
|
||||||
import com.intellij.openapi.editor.Editor
|
|
||||||
import com.intellij.openapi.project.Project
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight quick-fix to replace a misspelled word (subrange) with a suggested alternative.
|
|
||||||
* Works without the legacy Spell Checker. The replacement is applied directly to the file text.
|
|
||||||
*/
|
|
||||||
class ReplaceWordFix(
|
|
||||||
private val range: TextRange,
|
|
||||||
private val original: String,
|
|
||||||
private val replacementRaw: String
|
|
||||||
) : IntentionAction {
|
|
||||||
|
|
||||||
override fun getText(): String = "Replace '$original' with '$replacementRaw'"
|
|
||||||
override fun getFamilyName(): String = "Lyng Spelling"
|
|
||||||
override fun isAvailable(project: Project, editor: Editor?, file: PsiFile?): Boolean =
|
|
||||||
editor != null && file != null && range.startOffset in 0..range.endOffset
|
|
||||||
|
|
||||||
override fun startInWriteAction(): Boolean = true
|
|
||||||
|
|
||||||
override fun invoke(project: Project, editor: Editor?, file: PsiFile?) {
|
|
||||||
if (editor == null) return
|
|
||||||
val doc: Document = editor.document
|
|
||||||
val safeRange = range.constrainTo(doc)
|
|
||||||
val current = doc.getText(safeRange)
|
|
||||||
// Preserve basic case style based on the original token
|
|
||||||
val replacement = adaptCaseStyle(current, replacementRaw)
|
|
||||||
WriteCommandAction.runWriteCommandAction(project, "Replace word", null, Runnable {
|
|
||||||
doc.replaceString(safeRange.startOffset, safeRange.endOffset, replacement)
|
|
||||||
}, file)
|
|
||||||
// Move caret to end of replacement for convenience
|
|
||||||
try {
|
|
||||||
val caret: CaretModel = editor.caretModel
|
|
||||||
caret.moveToOffset(safeRange.startOffset + replacement.length)
|
|
||||||
} catch (_: Throwable) {}
|
|
||||||
// Restart daemon to refresh highlights
|
|
||||||
if (file != null) DaemonCodeAnalyzer.getInstance(project).restart(file)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun TextRange.constrainTo(doc: Document): TextRange {
|
|
||||||
val start = startOffset.coerceIn(0, doc.textLength)
|
|
||||||
val end = endOffset.coerceIn(start, doc.textLength)
|
|
||||||
return TextRange(start, end)
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun adaptCaseStyle(sample: String, suggestion: String): String {
|
|
||||||
if (suggestion.isEmpty()) return suggestion
|
|
||||||
return when {
|
|
||||||
sample.all { it.isUpperCase() } -> suggestion.uppercase()
|
|
||||||
// PascalCase / Capitalized single word
|
|
||||||
sample.firstOrNull()?.isUpperCase() == true && sample.drop(1).any { it.isLowerCase() } ->
|
|
||||||
suggestion.replaceFirstChar { if (it.isLowerCase()) it.titlecase() else it.toString() }
|
|
||||||
// snake_case -> lower
|
|
||||||
sample.contains('_') -> suggestion.lowercase()
|
|
||||||
// camelCase -> lower first
|
|
||||||
sample.firstOrNull()?.isLowerCase() == true && sample.any { it.isUpperCase() } ->
|
|
||||||
suggestion.replaceFirstChar { it.lowercase() }
|
|
||||||
else -> suggestion
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,77 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.grazie
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import java.io.BufferedReader
|
|
||||||
import java.io.InputStreamReader
|
|
||||||
import java.util.zip.GZIPInputStream
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Lightweight technical/Lyng vocabulary dictionary.
|
|
||||||
* Loaded from classpath resources; supports .txt and .txt.gz. Merged with EnglishDictionary.
|
|
||||||
*/
|
|
||||||
object TechDictionary {
|
|
||||||
private val log = Logger.getInstance(TechDictionary::class.java)
|
|
||||||
@Volatile private var loaded = false
|
|
||||||
@Volatile private var words: Set<String> = emptySet()
|
|
||||||
|
|
||||||
private fun ensureLoaded() {
|
|
||||||
if (loaded) return
|
|
||||||
synchronized(this) {
|
|
||||||
if (loaded) return
|
|
||||||
val candidates = listOf(
|
|
||||||
"/dictionaries/tech-lyng.txt.gz",
|
|
||||||
"/dictionaries/tech-lyng.txt"
|
|
||||||
)
|
|
||||||
val merged = HashSet<String>(8_000)
|
|
||||||
for (res in candidates) {
|
|
||||||
try {
|
|
||||||
val stream = javaClass.getResourceAsStream(res) ?: continue
|
|
||||||
val reader = if (res.endsWith(".gz"))
|
|
||||||
BufferedReader(InputStreamReader(GZIPInputStream(stream)))
|
|
||||||
else
|
|
||||||
BufferedReader(InputStreamReader(stream))
|
|
||||||
var n = 0
|
|
||||||
reader.useLines { seq -> seq.forEach { line ->
|
|
||||||
val w = line.trim()
|
|
||||||
if (w.isNotEmpty() && !w.startsWith("#")) { merged += w.lowercase(); n++ }
|
|
||||||
} }
|
|
||||||
log.info("TechDictionary: loaded $n words from $res (total=${merged.size})")
|
|
||||||
} catch (t: Throwable) {
|
|
||||||
log.info("TechDictionary: failed to load $res: ${t.javaClass.simpleName}: ${t.message}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
if (merged.isEmpty()) {
|
|
||||||
merged += setOf(
|
|
||||||
// minimal Lyng/tech seeding to avoid empty dictionary
|
|
||||||
"lyng","miniast","binder","printf","specifier","specifiers","regex","token","tokens",
|
|
||||||
"identifier","identifiers","keyword","keywords","comment","comments","string","strings",
|
|
||||||
"literal","literals","formatting","formatter","grazie","typo","typos","dictionary","dictionaries"
|
|
||||||
)
|
|
||||||
log.info("TechDictionary: using minimal built-in set (${merged.size})")
|
|
||||||
}
|
|
||||||
words = merged
|
|
||||||
loaded = true
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fun allWords(): Set<String> {
|
|
||||||
ensureLoaded()
|
|
||||||
return words
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -36,7 +36,7 @@ class LyngLexer : LexerBase() {
|
|||||||
"abstract", "closed", "override", "static", "extern", "open", "private", "protected",
|
"abstract", "closed", "override", "static", "extern", "open", "private", "protected",
|
||||||
"if", "else", "for", "while", "return", "true", "false", "null",
|
"if", "else", "for", "while", "return", "true", "false", "null",
|
||||||
"when", "in", "is", "break", "continue", "try", "catch", "finally",
|
"when", "in", "is", "break", "continue", "try", "catch", "finally",
|
||||||
"get", "set", "object", "enum", "init", "by", "property", "constructor"
|
"get", "set", "object", "enum", "init", "by", "step", "property", "constructor"
|
||||||
)
|
)
|
||||||
|
|
||||||
override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
|
override fun start(buffer: CharSequence, startOffset: Int, endOffset: Int, initialState: Int) {
|
||||||
@@ -101,8 +101,9 @@ class LyngLexer : LexerBase() {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
// String "..." with simple escape handling
|
// String "..." or '...' with simple escape handling
|
||||||
if (ch == '"') {
|
if (ch == '"' || ch == '\'') {
|
||||||
|
val quote = ch
|
||||||
i++
|
i++
|
||||||
while (i < endOffset) {
|
while (i < endOffset) {
|
||||||
val c = buffer[i]
|
val c = buffer[i]
|
||||||
@@ -110,7 +111,7 @@ class LyngLexer : LexerBase() {
|
|||||||
i += 2
|
i += 2
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
if (c == '"') { i++; break }
|
if (c == quote) { i++; break }
|
||||||
i++
|
i++
|
||||||
}
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
@@ -120,12 +121,39 @@ class LyngLexer : LexerBase() {
|
|||||||
|
|
||||||
// Number
|
// Number
|
||||||
if (ch.isDigit()) {
|
if (ch.isDigit()) {
|
||||||
|
// Check for hex: 0x...
|
||||||
|
if (ch == '0' && i + 1 < endOffset && buffer[i + 1] == 'x') {
|
||||||
|
i += 2
|
||||||
|
while (i < endOffset && (buffer[i].isDigit() || buffer[i] in 'a'..'f' || buffer[i] in 'A'..'F')) i++
|
||||||
|
myTokenEnd = i
|
||||||
|
myTokenType = LyngTokenTypes.NUMBER
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Decimal or integer
|
||||||
i++
|
i++
|
||||||
var hasDot = false
|
var hasDot = false
|
||||||
|
var hasE = false
|
||||||
while (i < endOffset) {
|
while (i < endOffset) {
|
||||||
val c = buffer[i]
|
val c = buffer[i]
|
||||||
if (c.isDigit()) { i++; continue }
|
if (c.isDigit() || c == '_') {
|
||||||
if (c == '.' && !hasDot) { hasDot = true; i++; continue }
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
if (c == '.' && !hasDot && !hasE) {
|
||||||
|
// Check if it's a fractional part (must be followed by a digit)
|
||||||
|
if (i + 1 < endOffset && buffer[i + 1].isDigit()) {
|
||||||
|
hasDot = true
|
||||||
|
i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if ((c == 'e' || c == 'E') && !hasE) {
|
||||||
|
hasE = true
|
||||||
|
i++
|
||||||
|
if (i < endOffset && (buffer[i] == '+' || buffer[i] == '-')) i++
|
||||||
|
continue
|
||||||
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
@@ -160,6 +188,35 @@ class LyngLexer : LexerBase() {
|
|||||||
// Punctuation
|
// Punctuation
|
||||||
if (isPunct(ch)) {
|
if (isPunct(ch)) {
|
||||||
i++
|
i++
|
||||||
|
// Handle common multi-char operators for better highlighting
|
||||||
|
when (ch) {
|
||||||
|
'.' -> {
|
||||||
|
if (i < endOffset && buffer[i] == '.') {
|
||||||
|
i++
|
||||||
|
if (i < endOffset && (buffer[i] == '.' || buffer[i] == '<')) i++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'=' -> {
|
||||||
|
if (i < endOffset && (buffer[i] == '=' || buffer[i] == '>' || buffer[i] == '~')) {
|
||||||
|
i++
|
||||||
|
if (buffer[i - 1] == '=' && i < endOffset && buffer[i] == '=') i++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
'+', '-', '*', '/', '%', '!', '<', '>', '&', '|', '?', ':', '^' -> {
|
||||||
|
if (i < endOffset) {
|
||||||
|
val next = buffer[i]
|
||||||
|
if (next == '=' || next == ch) {
|
||||||
|
i++
|
||||||
|
if (ch == '<' && next == '=' && i < endOffset && buffer[i] == '>') i++
|
||||||
|
if (ch == '!' && next == '=' && i < endOffset && buffer[i] == '=') i++
|
||||||
|
} else if (ch == '?' && (next == '.' || next == '[' || next == '(' || next == '{' || next == ':' || next == '?')) {
|
||||||
|
i++
|
||||||
|
} else if (ch == '-' && next == '>') {
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
myTokenEnd = i
|
myTokenEnd = i
|
||||||
myTokenType = LyngTokenTypes.PUNCT
|
myTokenType = LyngTokenTypes.PUNCT
|
||||||
return
|
return
|
||||||
|
|||||||
+2
-1
@@ -20,13 +20,14 @@ package net.sergeych.lyng.idea.navigation
|
|||||||
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
|
import com.intellij.codeInsight.navigation.actions.GotoDeclarationHandler
|
||||||
import com.intellij.openapi.editor.Editor
|
import com.intellij.openapi.editor.Editor
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Ensures Ctrl+B (Go to Definition) works on Lyng identifiers by resolving through LyngPsiReference.
|
* Ensures Ctrl+B (Go to Definition) works on Lyng identifiers by resolving through LyngPsiReference.
|
||||||
*/
|
*/
|
||||||
class LyngGotoDeclarationHandler : GotoDeclarationHandler {
|
class LyngGotoDeclarationHandler : GotoDeclarationHandler {
|
||||||
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
|
override fun getGotoDeclarationTargets(sourceElement: PsiElement?, offset: Int, editor: Editor?): Array<PsiElement>? {
|
||||||
if (sourceElement == null) return null
|
if (sourceElement == null || sourceElement.language != LyngLanguage) return null
|
||||||
|
|
||||||
val allTargets = mutableListOf<PsiElement>()
|
val allTargets = mutableListOf<PsiElement>()
|
||||||
|
|
||||||
|
|||||||
@@ -36,18 +36,22 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
val name = element.text ?: ""
|
val name = element.text ?: ""
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
val analysis = LyngAstManager.getAnalysis(file) ?: return emptyArray()
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val mini = analysis.mini ?: return emptyArray()
|
||||||
|
val binding = analysis.binding
|
||||||
|
val imported = analysis.importedModules.toSet()
|
||||||
|
val currentPackage = getPackageName(file)
|
||||||
|
val allowedPackages = if (currentPackage != null) imported + currentPackage else imported
|
||||||
|
|
||||||
// 1. Member resolution (obj.member)
|
// 1. Member resolution (obj.member)
|
||||||
val dotPos = TextCtx.findDotLeft(text, offset)
|
val dotPos = TextCtx.findDotLeft(text, offset)
|
||||||
if (dotPos != null) {
|
if (dotPos != null) {
|
||||||
val imported = DocLookupUtils.canonicalImportedModules(mini, text)
|
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported.toList(), binding)
|
||||||
val receiverClass = DocLookupUtils.guessReceiverClassViaMini(mini, text, dotPos, imported, binding)
|
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported.toList(), mini)
|
||||||
?: DocLookupUtils.guessReceiverClass(text, dotPos, imported, mini)
|
val staticOnly = DocLookupUtils.isStaticReceiver(mini, text, dotPos, imported.toList(), binding)
|
||||||
|
|
||||||
if (receiverClass != null) {
|
if (receiverClass != null) {
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, receiverClass, name, mini)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported.toList(), receiverClass, name, mini, staticOnly = staticOnly)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
val owner = resolved.first
|
val owner = resolved.first
|
||||||
val member = resolved.second
|
val member = resolved.second
|
||||||
@@ -62,11 +66,13 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
val kind = when(member) {
|
val kind = when(member) {
|
||||||
is MiniMemberFunDecl -> "Function"
|
is MiniMemberFunDecl -> "Function"
|
||||||
is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
|
is MiniMemberValDecl -> if (member.mutable) "Variable" else "Value"
|
||||||
|
is MiniMemberTypeAliasDecl -> "TypeAlias"
|
||||||
is MiniInitDecl -> "Initializer"
|
is MiniInitDecl -> "Initializer"
|
||||||
is MiniFunDecl -> "Function"
|
is MiniFunDecl -> "Function"
|
||||||
is MiniValDecl -> if (member.mutable) "Variable" else "Value"
|
is MiniValDecl -> if (member.mutable) "Variable" else "Value"
|
||||||
is MiniClassDecl -> "Class"
|
is MiniClassDecl -> "Class"
|
||||||
is MiniEnumDecl -> "Enum"
|
is MiniEnumDecl -> "Enum"
|
||||||
|
is MiniTypeAliasDecl -> "TypeAlias"
|
||||||
}
|
}
|
||||||
results.add(PsiElementResolveResult(LyngDeclarationElement(it, member.name, kind)))
|
results.add(PsiElementResolveResult(LyngDeclarationElement(it, member.name, kind)))
|
||||||
}
|
}
|
||||||
@@ -75,7 +81,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
}
|
}
|
||||||
// If we couldn't resolve exactly, we might still want to search globally but ONLY for members
|
// If we couldn't resolve exactly, we might still want to search globally but ONLY for members
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
results.addAll(resolveGlobally(file.project, name, membersOnly = true))
|
results.addAll(resolveGlobally(file.project, name, membersOnly = true, allowedPackages = allowedPackages))
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// 2. Local resolution via Binder
|
// 2. Local resolution via Binder
|
||||||
@@ -94,7 +100,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
// 3. Global project scan
|
// 3. Global project scan
|
||||||
// Only search globally if we haven't found a strong local match
|
// Only search globally if we haven't found a strong local match
|
||||||
if (results.isEmpty()) {
|
if (results.isEmpty()) {
|
||||||
results.addAll(resolveGlobally(file.project, name))
|
results.addAll(resolveGlobally(file.project, name, allowedPackages = allowedPackages))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -141,6 +147,16 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun getPackageName(file: PsiFile): String? {
|
||||||
|
val mini = LyngAstManager.getMiniAst(file) ?: return null
|
||||||
|
return try {
|
||||||
|
val pkg = mini.range.start.source.extractPackageName()
|
||||||
|
if (pkg.startsWith("lyng.")) pkg else "lyng.$pkg"
|
||||||
|
} catch (e: Exception) {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
override fun resolve(): PsiElement? {
|
override fun resolve(): PsiElement? {
|
||||||
val results = multiResolve(false)
|
val results = multiResolve(false)
|
||||||
if (results.isEmpty()) return null
|
if (results.isEmpty()) return null
|
||||||
@@ -154,13 +170,20 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
return target
|
return target
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false): List<ResolveResult> {
|
private fun resolveGlobally(project: Project, name: String, membersOnly: Boolean = false, allowedPackages: Set<String>? = null): List<ResolveResult> {
|
||||||
val results = mutableListOf<ResolveResult>()
|
val results = mutableListOf<ResolveResult>()
|
||||||
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
val files = FilenameIndex.getAllFilesByExt(project, "lyng", GlobalSearchScope.projectScope(project))
|
||||||
val psiManager = PsiManager.getInstance(project)
|
val psiManager = PsiManager.getInstance(project)
|
||||||
|
|
||||||
for (vFile in files) {
|
for (vFile in files) {
|
||||||
val file = psiManager.findFile(vFile) ?: continue
|
val file = psiManager.findFile(vFile) ?: continue
|
||||||
|
|
||||||
|
// Filter by package if requested
|
||||||
|
if (allowedPackages != null) {
|
||||||
|
val pkg = getPackageName(file)
|
||||||
|
if (pkg == null || pkg !in allowedPackages) continue
|
||||||
|
}
|
||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
val mini = LyngAstManager.getMiniAst(file) ?: continue
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
|
|
||||||
@@ -180,6 +203,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
is net.sergeych.lyng.miniast.MiniClassDecl -> "Class"
|
is net.sergeych.lyng.miniast.MiniClassDecl -> "Class"
|
||||||
is net.sergeych.lyng.miniast.MiniEnumDecl -> "Enum"
|
is net.sergeych.lyng.miniast.MiniEnumDecl -> "Enum"
|
||||||
is net.sergeych.lyng.miniast.MiniValDecl -> if (d.mutable) "Variable" else "Value"
|
is net.sergeych.lyng.miniast.MiniValDecl -> if (d.mutable) "Variable" else "Value"
|
||||||
|
is net.sergeych.lyng.miniast.MiniTypeAliasDecl -> "TypeAlias"
|
||||||
}
|
}
|
||||||
addIfMatch(d.name, d.nameStart, dKind)
|
addIfMatch(d.name, d.nameStart, dKind)
|
||||||
}
|
}
|
||||||
@@ -195,6 +219,7 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
val mKind = when(m) {
|
val mKind = when(m) {
|
||||||
is net.sergeych.lyng.miniast.MiniMemberFunDecl -> "Function"
|
is net.sergeych.lyng.miniast.MiniMemberFunDecl -> "Function"
|
||||||
is net.sergeych.lyng.miniast.MiniMemberValDecl -> if (m.mutable) "Variable" else "Value"
|
is net.sergeych.lyng.miniast.MiniMemberValDecl -> if (m.mutable) "Variable" else "Value"
|
||||||
|
is net.sergeych.lyng.miniast.MiniMemberTypeAliasDecl -> "TypeAlias"
|
||||||
is net.sergeych.lyng.miniast.MiniInitDecl -> "Initializer"
|
is net.sergeych.lyng.miniast.MiniInitDecl -> "Initializer"
|
||||||
}
|
}
|
||||||
addIfMatch(m.name, m.nameStart, mKind)
|
addIfMatch(m.name, m.nameStart, mKind)
|
||||||
|
|||||||
@@ -0,0 +1,27 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.idea.psi
|
||||||
|
|
||||||
|
import com.intellij.psi.tree.IElementType
|
||||||
|
import net.sergeych.lyng.idea.LyngLanguage
|
||||||
|
|
||||||
|
object LyngElementTypes {
|
||||||
|
val NAME_IDENTIFIER = IElementType("NAME_IDENTIFIER", LyngLanguage)
|
||||||
|
val PARAMETER_NAME = IElementType("PARAMETER_NAME", LyngLanguage)
|
||||||
|
val ENUM_CONSTANT_NAME = IElementType("ENUM_CONSTANT_NAME", LyngLanguage)
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -45,7 +45,68 @@ class LyngParserDefinition : ParserDefinition {
|
|||||||
|
|
||||||
override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
|
override fun createParser(project: Project?): PsiParser = PsiParser { root, builder ->
|
||||||
val mark: PsiBuilder.Marker = builder.mark()
|
val mark: PsiBuilder.Marker = builder.mark()
|
||||||
while (!builder.eof()) builder.advanceLexer()
|
var lastKeyword: String? = null
|
||||||
|
var inEnum = false
|
||||||
|
var inParams = false
|
||||||
|
var parenDepth = 0
|
||||||
|
var braceDepth = 0
|
||||||
|
|
||||||
|
while (!builder.eof()) {
|
||||||
|
val type = builder.tokenType
|
||||||
|
val text = builder.tokenText
|
||||||
|
|
||||||
|
when (type) {
|
||||||
|
LyngTokenTypes.KEYWORD -> {
|
||||||
|
lastKeyword = text
|
||||||
|
if (text == "enum") inEnum = true
|
||||||
|
}
|
||||||
|
LyngTokenTypes.PUNCT -> {
|
||||||
|
if (text == "(") {
|
||||||
|
parenDepth++
|
||||||
|
if (lastKeyword == "fun" || lastKeyword == "constructor" || lastKeyword == "init") inParams = true
|
||||||
|
} else if (text == ")") {
|
||||||
|
parenDepth--
|
||||||
|
if (parenDepth == 0) inParams = false
|
||||||
|
} else if (text == "{") {
|
||||||
|
braceDepth++
|
||||||
|
} else if (text == "}") {
|
||||||
|
braceDepth--
|
||||||
|
if (braceDepth == 0) inEnum = false
|
||||||
|
}
|
||||||
|
if (text != ".") lastKeyword = null
|
||||||
|
}
|
||||||
|
LyngTokenTypes.IDENTIFIER -> {
|
||||||
|
val m = builder.mark()
|
||||||
|
builder.advanceLexer()
|
||||||
|
val nextType = builder.tokenType
|
||||||
|
val isQualified = nextType == LyngTokenTypes.PUNCT && builder.tokenText == "."
|
||||||
|
|
||||||
|
if (!isQualified) {
|
||||||
|
when {
|
||||||
|
lastKeyword in setOf("fun", "val", "var", "class", "enum", "object", "interface", "type", "property") -> {
|
||||||
|
m.done(LyngElementTypes.NAME_IDENTIFIER)
|
||||||
|
}
|
||||||
|
inParams && parenDepth > 0 -> {
|
||||||
|
m.done(LyngElementTypes.PARAMETER_NAME)
|
||||||
|
}
|
||||||
|
inEnum && braceDepth > 0 && parenDepth == 0 -> {
|
||||||
|
m.done(LyngElementTypes.ENUM_CONSTANT_NAME)
|
||||||
|
}
|
||||||
|
else -> m.drop()
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
m.drop()
|
||||||
|
}
|
||||||
|
lastKeyword = null
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
LyngTokenTypes.WHITESPACE, LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> {
|
||||||
|
// keep lastKeyword
|
||||||
|
}
|
||||||
|
else -> lastKeyword = null
|
||||||
|
}
|
||||||
|
builder.advanceLexer()
|
||||||
|
}
|
||||||
mark.done(root)
|
mark.done(root)
|
||||||
builder.treeBuilt
|
builder.treeBuilt
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -32,24 +32,6 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
|
|||||||
var reindentClosedBlockOnEnter: Boolean = true,
|
var reindentClosedBlockOnEnter: Boolean = true,
|
||||||
var reindentPastedBlocks: Boolean = true,
|
var reindentPastedBlocks: Boolean = true,
|
||||||
var normalizeBlockCommentIndent: Boolean = false,
|
var normalizeBlockCommentIndent: Boolean = false,
|
||||||
var spellCheckStringLiterals: Boolean = true,
|
|
||||||
// When Grazie/Natural Languages is present, prefer it for comments and literals (avoid legacy duplicates)
|
|
||||||
var preferGrazieForCommentsAndLiterals: Boolean = true,
|
|
||||||
// When Grazie is available, also check identifiers via Grazie.
|
|
||||||
// Default OFF because Grazie typically doesn't flag code identifiers; legacy Spellchecker is better for code.
|
|
||||||
var grazieChecksIdentifiers: Boolean = false,
|
|
||||||
// Grazie-only fallback: treat identifiers as comments domain so Grazie applies spelling rules
|
|
||||||
var grazieTreatIdentifiersAsComments: Boolean = true,
|
|
||||||
// Grazie-only fallback: treat string literals as comments domain when LITERALS domain is not requested
|
|
||||||
var grazieTreatLiteralsAsComments: Boolean = true,
|
|
||||||
// Debug helper: show the exact ranges we feed to Grazie/legacy as weak warnings
|
|
||||||
var debugShowSpellFeed: Boolean = false,
|
|
||||||
// Visuals: render Lyng typos using the standard Typo green underline styling
|
|
||||||
var showTyposWithGreenUnderline: Boolean = true,
|
|
||||||
// Enable lightweight quick-fixes (Replace..., Add to dictionary) without legacy Spell Checker
|
|
||||||
var offerLyngTypoQuickFixes: Boolean = true,
|
|
||||||
// Per-project learned words (do not flag again)
|
|
||||||
var learnedWords: MutableSet<String> = mutableSetOf(),
|
|
||||||
// Experimental: enable Lyng autocompletion (can be disabled if needed)
|
// Experimental: enable Lyng autocompletion (can be disabled if needed)
|
||||||
var enableLyngCompletionExperimental: Boolean = true,
|
var enableLyngCompletionExperimental: Boolean = true,
|
||||||
)
|
)
|
||||||
@@ -82,42 +64,6 @@ class LyngFormatterSettings(private val project: Project) : PersistentStateCompo
|
|||||||
get() = myState.normalizeBlockCommentIndent
|
get() = myState.normalizeBlockCommentIndent
|
||||||
set(value) { myState.normalizeBlockCommentIndent = value }
|
set(value) { myState.normalizeBlockCommentIndent = value }
|
||||||
|
|
||||||
var spellCheckStringLiterals: Boolean
|
|
||||||
get() = myState.spellCheckStringLiterals
|
|
||||||
set(value) { myState.spellCheckStringLiterals = value }
|
|
||||||
|
|
||||||
var preferGrazieForCommentsAndLiterals: Boolean
|
|
||||||
get() = myState.preferGrazieForCommentsAndLiterals
|
|
||||||
set(value) { myState.preferGrazieForCommentsAndLiterals = value }
|
|
||||||
|
|
||||||
var grazieChecksIdentifiers: Boolean
|
|
||||||
get() = myState.grazieChecksIdentifiers
|
|
||||||
set(value) { myState.grazieChecksIdentifiers = value }
|
|
||||||
|
|
||||||
var grazieTreatIdentifiersAsComments: Boolean
|
|
||||||
get() = myState.grazieTreatIdentifiersAsComments
|
|
||||||
set(value) { myState.grazieTreatIdentifiersAsComments = value }
|
|
||||||
|
|
||||||
var grazieTreatLiteralsAsComments: Boolean
|
|
||||||
get() = myState.grazieTreatLiteralsAsComments
|
|
||||||
set(value) { myState.grazieTreatLiteralsAsComments = value }
|
|
||||||
|
|
||||||
var debugShowSpellFeed: Boolean
|
|
||||||
get() = myState.debugShowSpellFeed
|
|
||||||
set(value) { myState.debugShowSpellFeed = value }
|
|
||||||
|
|
||||||
var showTyposWithGreenUnderline: Boolean
|
|
||||||
get() = myState.showTyposWithGreenUnderline
|
|
||||||
set(value) { myState.showTyposWithGreenUnderline = value }
|
|
||||||
|
|
||||||
var offerLyngTypoQuickFixes: Boolean
|
|
||||||
get() = myState.offerLyngTypoQuickFixes
|
|
||||||
set(value) { myState.offerLyngTypoQuickFixes = value }
|
|
||||||
|
|
||||||
var learnedWords: MutableSet<String>
|
|
||||||
get() = myState.learnedWords
|
|
||||||
set(value) { myState.learnedWords = value }
|
|
||||||
|
|
||||||
var enableLyngCompletionExperimental: Boolean
|
var enableLyngCompletionExperimental: Boolean
|
||||||
get() = myState.enableLyngCompletionExperimental
|
get() = myState.enableLyngCompletionExperimental
|
||||||
set(value) { myState.enableLyngCompletionExperimental = value }
|
set(value) { myState.enableLyngCompletionExperimental = value }
|
||||||
|
|||||||
+1
-56
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -30,14 +30,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
private var reindentClosedBlockCb: JCheckBox? = null
|
private var reindentClosedBlockCb: JCheckBox? = null
|
||||||
private var reindentPasteCb: JCheckBox? = null
|
private var reindentPasteCb: JCheckBox? = null
|
||||||
private var normalizeBlockCommentIndentCb: JCheckBox? = null
|
private var normalizeBlockCommentIndentCb: JCheckBox? = null
|
||||||
private var spellCheckLiteralsCb: JCheckBox? = null
|
|
||||||
private var preferGrazieCommentsLiteralsCb: JCheckBox? = null
|
|
||||||
private var grazieChecksIdentifiersCb: JCheckBox? = null
|
|
||||||
private var grazieIdsAsCommentsCb: JCheckBox? = null
|
|
||||||
private var grazieLiteralsAsCommentsCb: JCheckBox? = null
|
|
||||||
private var debugShowSpellFeedCb: JCheckBox? = null
|
|
||||||
private var showTyposGreenCb: JCheckBox? = null
|
|
||||||
private var offerQuickFixesCb: JCheckBox? = null
|
|
||||||
private var enableCompletionCb: JCheckBox? = null
|
private var enableCompletionCb: JCheckBox? = null
|
||||||
|
|
||||||
override fun getDisplayName(): String = "Lyng Formatter"
|
override fun getDisplayName(): String = "Lyng Formatter"
|
||||||
@@ -50,14 +42,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
|
reindentClosedBlockCb = JCheckBox("Reindent enclosed block on Enter after '}'")
|
||||||
reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
|
reindentPasteCb = JCheckBox("Reindent pasted blocks (align pasted code to current indent)")
|
||||||
normalizeBlockCommentIndentCb = JCheckBox("Normalize block comment indentation [experimental]")
|
normalizeBlockCommentIndentCb = JCheckBox("Normalize block comment indentation [experimental]")
|
||||||
spellCheckLiteralsCb = JCheckBox("Spell check string literals (skip % specifiers like %s, %d, %-12s)")
|
|
||||||
preferGrazieCommentsLiteralsCb = JCheckBox("Prefer Natural Languages/Grazie for comments and string literals (avoid duplicates)")
|
|
||||||
grazieChecksIdentifiersCb = JCheckBox("Check identifiers via Natural Languages/Grazie when available")
|
|
||||||
grazieIdsAsCommentsCb = JCheckBox("Natural Languages/Grazie: treat identifiers as comments (forces spelling checks in 2024.3)")
|
|
||||||
grazieLiteralsAsCommentsCb = JCheckBox("Natural Languages/Grazie: treat string literals as comments when literals are not processed")
|
|
||||||
debugShowSpellFeedCb = JCheckBox("Debug: show spell-feed ranges (weak warnings)")
|
|
||||||
showTyposGreenCb = JCheckBox("Show Lyng typos with green underline (TYPO styling)")
|
|
||||||
offerQuickFixesCb = JCheckBox("Offer Lyng typo quick fixes (Replace…, Add to dictionary) without Spell Checker")
|
|
||||||
enableCompletionCb = JCheckBox("Enable Lyng autocompletion (experimental)")
|
enableCompletionCb = JCheckBox("Enable Lyng autocompletion (experimental)")
|
||||||
|
|
||||||
// Tooltips / short help
|
// Tooltips / short help
|
||||||
@@ -66,27 +50,12 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.toolTipText = "On Enter after a closing '}', reindent the just-closed {…} block using formatter rules."
|
reindentClosedBlockCb?.toolTipText = "On Enter after a closing '}', reindent the just-closed {…} block using formatter rules."
|
||||||
reindentPasteCb?.toolTipText = "When caret is in leading whitespace, reindent the pasted text and align it to the caret's indent."
|
reindentPasteCb?.toolTipText = "When caret is in leading whitespace, reindent the pasted text and align it to the caret's indent."
|
||||||
normalizeBlockCommentIndentCb?.toolTipText = "Experimental: normalize indentation inside /* … */ comments (code is not modified)."
|
normalizeBlockCommentIndentCb?.toolTipText = "Experimental: normalize indentation inside /* … */ comments (code is not modified)."
|
||||||
preferGrazieCommentsLiteralsCb?.toolTipText = "When ON and Natural Languages/Grazie is installed, comments and string literals are checked by Grazie. Turn OFF to force legacy Spellchecker to check them."
|
|
||||||
grazieChecksIdentifiersCb?.toolTipText = "When ON and Natural Languages/Grazie is installed, identifiers (non-keywords) are checked by Grazie too."
|
|
||||||
grazieIdsAsCommentsCb?.toolTipText = "Grazie-only fallback: route identifiers as COMMENTS domain so Grazie applies spelling in 2024.3."
|
|
||||||
grazieLiteralsAsCommentsCb?.toolTipText = "Grazie-only fallback: when Grammar doesn't process literals, route strings as COMMENTS so they are checked."
|
|
||||||
debugShowSpellFeedCb?.toolTipText = "Show the exact ranges we feed to spellcheckers (ids/comments/strings) as weak warnings."
|
|
||||||
showTyposGreenCb?.toolTipText = "Render Lyng typos using the platform's green TYPO underline instead of generic warnings."
|
|
||||||
offerQuickFixesCb?.toolTipText = "Provide lightweight Replace… and Add to dictionary quick-fixes without requiring the legacy Spell Checker."
|
|
||||||
enableCompletionCb?.toolTipText = "Turn on/off the lightweight Lyng code completion (BASIC)."
|
enableCompletionCb?.toolTipText = "Turn on/off the lightweight Lyng code completion (BASIC)."
|
||||||
p.add(spacingCb)
|
p.add(spacingCb)
|
||||||
p.add(wrappingCb)
|
p.add(wrappingCb)
|
||||||
p.add(reindentClosedBlockCb)
|
p.add(reindentClosedBlockCb)
|
||||||
p.add(reindentPasteCb)
|
p.add(reindentPasteCb)
|
||||||
p.add(normalizeBlockCommentIndentCb)
|
p.add(normalizeBlockCommentIndentCb)
|
||||||
p.add(spellCheckLiteralsCb)
|
|
||||||
p.add(preferGrazieCommentsLiteralsCb)
|
|
||||||
p.add(grazieChecksIdentifiersCb)
|
|
||||||
p.add(grazieIdsAsCommentsCb)
|
|
||||||
p.add(grazieLiteralsAsCommentsCb)
|
|
||||||
p.add(debugShowSpellFeedCb)
|
|
||||||
p.add(showTyposGreenCb)
|
|
||||||
p.add(offerQuickFixesCb)
|
|
||||||
p.add(enableCompletionCb)
|
p.add(enableCompletionCb)
|
||||||
panel = p
|
panel = p
|
||||||
reset()
|
reset()
|
||||||
@@ -100,14 +69,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
|
reindentClosedBlockCb?.isSelected != s.reindentClosedBlockOnEnter ||
|
||||||
reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
|
reindentPasteCb?.isSelected != s.reindentPastedBlocks ||
|
||||||
normalizeBlockCommentIndentCb?.isSelected != s.normalizeBlockCommentIndent ||
|
normalizeBlockCommentIndentCb?.isSelected != s.normalizeBlockCommentIndent ||
|
||||||
spellCheckLiteralsCb?.isSelected != s.spellCheckStringLiterals ||
|
|
||||||
preferGrazieCommentsLiteralsCb?.isSelected != s.preferGrazieForCommentsAndLiterals ||
|
|
||||||
grazieChecksIdentifiersCb?.isSelected != s.grazieChecksIdentifiers ||
|
|
||||||
grazieIdsAsCommentsCb?.isSelected != s.grazieTreatIdentifiersAsComments ||
|
|
||||||
grazieLiteralsAsCommentsCb?.isSelected != s.grazieTreatLiteralsAsComments ||
|
|
||||||
debugShowSpellFeedCb?.isSelected != s.debugShowSpellFeed ||
|
|
||||||
showTyposGreenCb?.isSelected != s.showTyposWithGreenUnderline ||
|
|
||||||
offerQuickFixesCb?.isSelected != s.offerLyngTypoQuickFixes ||
|
|
||||||
enableCompletionCb?.isSelected != s.enableLyngCompletionExperimental
|
enableCompletionCb?.isSelected != s.enableLyngCompletionExperimental
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -118,14 +79,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
|
s.reindentClosedBlockOnEnter = reindentClosedBlockCb?.isSelected == true
|
||||||
s.reindentPastedBlocks = reindentPasteCb?.isSelected == true
|
s.reindentPastedBlocks = reindentPasteCb?.isSelected == true
|
||||||
s.normalizeBlockCommentIndent = normalizeBlockCommentIndentCb?.isSelected == true
|
s.normalizeBlockCommentIndent = normalizeBlockCommentIndentCb?.isSelected == true
|
||||||
s.spellCheckStringLiterals = spellCheckLiteralsCb?.isSelected == true
|
|
||||||
s.preferGrazieForCommentsAndLiterals = preferGrazieCommentsLiteralsCb?.isSelected == true
|
|
||||||
s.grazieChecksIdentifiers = grazieChecksIdentifiersCb?.isSelected == true
|
|
||||||
s.grazieTreatIdentifiersAsComments = grazieIdsAsCommentsCb?.isSelected == true
|
|
||||||
s.grazieTreatLiteralsAsComments = grazieLiteralsAsCommentsCb?.isSelected == true
|
|
||||||
s.debugShowSpellFeed = debugShowSpellFeedCb?.isSelected == true
|
|
||||||
s.showTyposWithGreenUnderline = showTyposGreenCb?.isSelected == true
|
|
||||||
s.offerLyngTypoQuickFixes = offerQuickFixesCb?.isSelected == true
|
|
||||||
s.enableLyngCompletionExperimental = enableCompletionCb?.isSelected == true
|
s.enableLyngCompletionExperimental = enableCompletionCb?.isSelected == true
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,14 +89,6 @@ class LyngFormatterSettingsConfigurable(private val project: Project) : Configur
|
|||||||
reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
|
reindentClosedBlockCb?.isSelected = s.reindentClosedBlockOnEnter
|
||||||
reindentPasteCb?.isSelected = s.reindentPastedBlocks
|
reindentPasteCb?.isSelected = s.reindentPastedBlocks
|
||||||
normalizeBlockCommentIndentCb?.isSelected = s.normalizeBlockCommentIndent
|
normalizeBlockCommentIndentCb?.isSelected = s.normalizeBlockCommentIndent
|
||||||
spellCheckLiteralsCb?.isSelected = s.spellCheckStringLiterals
|
|
||||||
preferGrazieCommentsLiteralsCb?.isSelected = s.preferGrazieForCommentsAndLiterals
|
|
||||||
grazieChecksIdentifiersCb?.isSelected = s.grazieChecksIdentifiers
|
|
||||||
grazieIdsAsCommentsCb?.isSelected = s.grazieTreatIdentifiersAsComments
|
|
||||||
grazieLiteralsAsCommentsCb?.isSelected = s.grazieTreatLiteralsAsComments
|
|
||||||
debugShowSpellFeedCb?.isSelected = s.debugShowSpellFeed
|
|
||||||
showTyposGreenCb?.isSelected = s.showTyposWithGreenUnderline
|
|
||||||
offerQuickFixesCb?.isSelected = s.offerLyngTypoQuickFixes
|
|
||||||
enableCompletionCb?.isSelected = s.enableLyngCompletionExperimental
|
enableCompletionCb?.isSelected = s.enableLyngCompletionExperimental
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
/*
|
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
|
||||||
*
|
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
|
||||||
* you may not use this file except in compliance with the License.
|
|
||||||
* You may obtain a copy of the License at
|
|
||||||
*
|
|
||||||
* http://www.apache.org/licenses/LICENSE-2.0
|
|
||||||
*
|
|
||||||
* Unless required by applicable law or agreed to in writing, software
|
|
||||||
* distributed under the License is distributed on an "AS IS" BASIS,
|
|
||||||
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
||||||
* See the License for the specific language governing permissions and
|
|
||||||
* limitations under the License.
|
|
||||||
*
|
|
||||||
*/
|
|
||||||
package net.sergeych.lyng.idea.spell
|
|
||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.util.Key
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiFile
|
|
||||||
|
|
||||||
/**
|
|
||||||
* Per-file cached spellcheck index built from MiniAst-based highlighting and the lynglib highlighter.
|
|
||||||
* It exposes identifier, comment, and string literal ranges. Strategies should suspend until data is ready.
|
|
||||||
*/
|
|
||||||
object LyngSpellIndex {
|
|
||||||
private val LOG = Logger.getInstance(LyngSpellIndex::class.java)
|
|
||||||
|
|
||||||
data class Data(
|
|
||||||
val modStamp: Long,
|
|
||||||
val identifiers: List<TextRange>,
|
|
||||||
val comments: List<TextRange>,
|
|
||||||
val strings: List<TextRange>,
|
|
||||||
)
|
|
||||||
|
|
||||||
private val KEY: Key<Data> = Key.create("LYNG_SPELL_INDEX")
|
|
||||||
|
|
||||||
fun getUpToDate(file: PsiFile): Data? {
|
|
||||||
val doc = file.viewProvider.document ?: return null
|
|
||||||
val d = file.getUserData(KEY) ?: return null
|
|
||||||
return if (d.modStamp == doc.modificationStamp) d else null
|
|
||||||
}
|
|
||||||
|
|
||||||
fun store(file: PsiFile, data: Data) {
|
|
||||||
file.putUserData(KEY, data)
|
|
||||||
LOG.info("LyngSpellIndex built: ids=${data.identifiers.size}, comments=${data.comments.size}, strings=${data.strings.size}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+14
-128
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -16,140 +16,26 @@
|
|||||||
*/
|
*/
|
||||||
package net.sergeych.lyng.idea.spell
|
package net.sergeych.lyng.idea.spell
|
||||||
|
|
||||||
// Avoid Tokenizers helper to keep compatibility; implement our own tokenizers
|
|
||||||
import com.intellij.ide.plugins.PluginManagerCore
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
|
||||||
import com.intellij.openapi.extensions.PluginId
|
|
||||||
import com.intellij.openapi.util.TextRange
|
|
||||||
import com.intellij.psi.PsiElement
|
import com.intellij.psi.PsiElement
|
||||||
import com.intellij.spellchecker.inspections.PlainTextSplitter
|
|
||||||
import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
|
import com.intellij.spellchecker.tokenizer.SpellcheckingStrategy
|
||||||
import com.intellij.spellchecker.tokenizer.TokenConsumer
|
|
||||||
import com.intellij.spellchecker.tokenizer.Tokenizer
|
import com.intellij.spellchecker.tokenizer.Tokenizer
|
||||||
import net.sergeych.lyng.idea.settings.LyngFormatterSettings
|
import net.sergeych.lyng.idea.highlight.LyngTokenTypes
|
||||||
|
import net.sergeych.lyng.idea.psi.LyngElementTypes
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Spellchecking strategy for Lyng:
|
* Standard IntelliJ spellchecking strategy for Lyng.
|
||||||
* - Identifiers: checked as identifiers
|
* Uses the simplified PSI structure to identify declarations.
|
||||||
* - Comments: checked as plain text
|
|
||||||
* - Keywords: skipped
|
|
||||||
* - String literals: optional (controlled by settings), and we exclude printf-style format specifiers like
|
|
||||||
* %s, %d, %-12s, %0.2f, etc.
|
|
||||||
*/
|
*/
|
||||||
class LyngSpellcheckingStrategy : SpellcheckingStrategy() {
|
class LyngSpellcheckingStrategy : SpellcheckingStrategy() {
|
||||||
|
override fun getTokenizer(element: PsiElement?): Tokenizer<*> {
|
||||||
private val log = Logger.getInstance(LyngSpellcheckingStrategy::class.java)
|
val type = element?.node?.elementType
|
||||||
@Volatile private var loggedOnce = false
|
return when (type) {
|
||||||
|
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TEXT_TOKENIZER
|
||||||
private fun grazieInstalled(): Boolean {
|
LyngTokenTypes.STRING -> TEXT_TOKENIZER
|
||||||
// Support both historical and bundled IDs
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
return PluginManagerCore.isPluginInstalled(PluginId.getId("com.intellij.grazie")) ||
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
PluginManagerCore.isPluginInstalled(PluginId.getId("tanvd.grazi"))
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TEXT_TOKENIZER
|
||||||
}
|
else -> super.getTokenizer(element)
|
||||||
|
|
||||||
private fun grazieApiAvailable(): Boolean = try {
|
|
||||||
// If this class is absent (as in IC-243), third-party plugins can't run Grazie programmatically
|
|
||||||
Class.forName("com.intellij.grazie.grammar.GrammarChecker")
|
|
||||||
true
|
|
||||||
} catch (_: Throwable) { false }
|
|
||||||
|
|
||||||
override fun getTokenizer(element: PsiElement): Tokenizer<*> {
|
|
||||||
val hasGrazie = grazieInstalled()
|
|
||||||
val hasGrazieApi = grazieApiAvailable()
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
if (!loggedOnce) {
|
|
||||||
loggedOnce = true
|
|
||||||
log.info("LyngSpellcheckingStrategy activated: hasGrazie=$hasGrazie, grazieApi=$hasGrazieApi, preferGrazieForCommentsAndLiterals=${settings.preferGrazieForCommentsAndLiterals}, spellCheckStringLiterals=${settings.spellCheckStringLiterals}, grazieChecksIdentifiers=${settings.grazieChecksIdentifiers}")
|
|
||||||
}
|
|
||||||
|
|
||||||
val file = element.containingFile ?: return EMPTY_TOKENIZER
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file) ?: run {
|
|
||||||
// Suspend legacy spellcheck until MiniAst-based index is ready
|
|
||||||
return EMPTY_TOKENIZER
|
|
||||||
}
|
|
||||||
val elRange = element.textRange ?: return EMPTY_TOKENIZER
|
|
||||||
|
|
||||||
fun overlaps(list: List<TextRange>) = list.any { it.intersects(elRange) }
|
|
||||||
|
|
||||||
// Decide responsibility per settings
|
|
||||||
// If Grazie is present but its public API is not available (IC-243), do NOT delegate to it.
|
|
||||||
val preferGrazie = hasGrazie && hasGrazieApi && settings.preferGrazieForCommentsAndLiterals
|
|
||||||
val grazieIds = hasGrazie && hasGrazieApi && settings.grazieChecksIdentifiers
|
|
||||||
|
|
||||||
// Identifiers: only if range is within identifiers index and not delegated to Grazie
|
|
||||||
if (overlaps(index.identifiers) && !grazieIds) return IDENTIFIER_TOKENIZER
|
|
||||||
|
|
||||||
// Comments: only if not delegated to Grazie and overlapping indexed comments
|
|
||||||
if (!preferGrazie && overlaps(index.comments)) return COMMENT_TEXT_TOKENIZER
|
|
||||||
|
|
||||||
// Strings: only if not delegated to Grazie, literals checking enabled, and overlapping indexed strings
|
|
||||||
if (!preferGrazie && settings.spellCheckStringLiterals && overlaps(index.strings)) return STRING_WITH_PRINTF_EXCLUDES
|
|
||||||
|
|
||||||
return EMPTY_TOKENIZER
|
|
||||||
}
|
|
||||||
|
|
||||||
private object EMPTY_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object IDENTIFIER_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
val text = element.text
|
|
||||||
if (text.isNullOrEmpty()) return
|
|
||||||
consumer.consumeToken(element, text, false, 0, TextRange(0, text.length), splitter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object COMMENT_TEXT_TOKENIZER : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
val text = element.text
|
|
||||||
if (text.isNullOrEmpty()) return
|
|
||||||
consumer.consumeToken(element, text, false, 0, TextRange(0, text.length), splitter)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private object STRING_WITH_PRINTF_EXCLUDES : Tokenizer<PsiElement>() {
|
|
||||||
private val splitter = PlainTextSplitter.getInstance()
|
|
||||||
|
|
||||||
// Regex for printf-style specifiers: %[flags][width][.precision][length]type
|
|
||||||
// This is intentionally permissive to skip common cases like %s, %d, %-12s, %08x, %.2f, %%
|
|
||||||
private val SPEC = Regex("%(?:[-+ #0]*(?:\\d+)?(?:\\.\\d+)?[a-zA-Z%])")
|
|
||||||
|
|
||||||
override fun tokenize(element: PsiElement, consumer: TokenConsumer) {
|
|
||||||
// Check project settings whether literals should be spell-checked
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
if (!settings.spellCheckStringLiterals) return
|
|
||||||
|
|
||||||
val text = element.text
|
|
||||||
if (text.isEmpty()) return
|
|
||||||
|
|
||||||
// Try to strip surrounding quotes (simple lexer token for Lyng strings)
|
|
||||||
var startOffsetInElement = 0
|
|
||||||
var endOffsetInElement = text.length
|
|
||||||
if (text.length >= 2 && (text.first() == '"' && text.last() == '"' || text.first() == '\'' && text.last() == '\'')) {
|
|
||||||
startOffsetInElement = 1
|
|
||||||
endOffsetInElement = text.length - 1
|
|
||||||
}
|
|
||||||
if (endOffsetInElement <= startOffsetInElement) return
|
|
||||||
|
|
||||||
val content = text.substring(startOffsetInElement, endOffsetInElement)
|
|
||||||
|
|
||||||
var last = 0
|
|
||||||
for (m in SPEC.findAll(content)) {
|
|
||||||
val ms = m.range.first
|
|
||||||
val me = m.range.last + 1
|
|
||||||
if (ms > last) {
|
|
||||||
val range = TextRange(startOffsetInElement + last, startOffsetInElement + ms)
|
|
||||||
consumer.consumeToken(element, text, false, 0, range, splitter)
|
|
||||||
}
|
|
||||||
last = me
|
|
||||||
}
|
|
||||||
if (last < content.length) {
|
|
||||||
val range = TextRange(startOffsetInElement + last, startOffsetInElement + content.length)
|
|
||||||
consumer.consumeToken(element, text, false, 0, range, splitter)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Ensure external/bundled docs are registered in BuiltinDocRegistry
|
* Ensure external/bundled docs are registered in BuiltinDocRegistry
|
||||||
* so completion/quickdoc can resolve things like lyng.io.fs.Path.
|
* so completion/quickdoc can resolve things like lyng.io.fs.Path.
|
||||||
@@ -6,6 +23,7 @@ package net.sergeych.lyng.idea.util
|
|||||||
|
|
||||||
import com.intellij.openapi.diagnostic.Logger
|
import com.intellij.openapi.diagnostic.Logger
|
||||||
import net.sergeych.lyng.idea.docs.FsDocsFallback
|
import net.sergeych.lyng.idea.docs.FsDocsFallback
|
||||||
|
import net.sergeych.lyng.idea.docs.ProcessDocsFallback
|
||||||
|
|
||||||
object DocsBootstrap {
|
object DocsBootstrap {
|
||||||
private val log = Logger.getInstance(DocsBootstrap::class.java)
|
private val log = Logger.getInstance(DocsBootstrap::class.java)
|
||||||
@@ -20,20 +38,32 @@ object DocsBootstrap {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun tryLoadExternal(): Boolean = try {
|
private fun tryLoadExternal(): Boolean {
|
||||||
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
var anyLoaded = false
|
||||||
val m = cls.getMethod("ensure")
|
try {
|
||||||
m.invoke(null)
|
val cls = Class.forName("net.sergeych.lyngio.docs.FsBuiltinDocs")
|
||||||
log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
val m = cls.getMethod("ensure")
|
||||||
true
|
m.invoke(null)
|
||||||
} catch (_: Throwable) {
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.FsBuiltinDocs.ensure() OK")
|
||||||
false
|
anyLoaded = true
|
||||||
|
} catch (_: Throwable) {}
|
||||||
|
|
||||||
|
try {
|
||||||
|
val cls = Class.forName("net.sergeych.lyngio.docs.ProcessBuiltinDocs")
|
||||||
|
val m = cls.getMethod("ensure")
|
||||||
|
m.invoke(null)
|
||||||
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs loaded: net.sergeych.lyngio.docs.ProcessBuiltinDocs.ensure() OK")
|
||||||
|
anyLoaded = true
|
||||||
|
} catch (_: Throwable) {}
|
||||||
|
return anyLoaded
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun trySeedFallback(): Boolean = try {
|
private fun trySeedFallback(): Boolean = try {
|
||||||
val seeded = FsDocsFallback.ensureOnce()
|
val seededFs = FsDocsFallback.ensureOnce()
|
||||||
|
val seededProcess = ProcessDocsFallback.ensureOnce()
|
||||||
|
val seeded = seededFs || seededProcess
|
||||||
if (seeded) {
|
if (seeded) {
|
||||||
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; seeded plugin fallback for lyng.io.fs")
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; seeded plugin fallback for lyng.io.fs/process")
|
||||||
} else {
|
} else {
|
||||||
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; no fallback seeded")
|
log.info("[LYNG_DEBUG] DocsBootstrap: external docs not found; no fallback seeded")
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -22,55 +22,22 @@ import com.intellij.openapi.util.Key
|
|||||||
import com.intellij.psi.PsiFile
|
import com.intellij.psi.PsiFile
|
||||||
import com.intellij.psi.PsiManager
|
import com.intellij.psi.PsiManager
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
import net.sergeych.lyng.Compiler
|
|
||||||
import net.sergeych.lyng.Source
|
|
||||||
import net.sergeych.lyng.binding.Binder
|
|
||||||
import net.sergeych.lyng.binding.BindingSnapshot
|
import net.sergeych.lyng.binding.BindingSnapshot
|
||||||
import net.sergeych.lyng.miniast.MiniAstBuilder
|
import net.sergeych.lyng.miniast.DocLookupUtils
|
||||||
import net.sergeych.lyng.miniast.MiniScript
|
import net.sergeych.lyng.miniast.MiniScript
|
||||||
|
import net.sergeych.lyng.tools.IdeLenientImportProvider
|
||||||
|
import net.sergeych.lyng.tools.LyngAnalysisRequest
|
||||||
|
import net.sergeych.lyng.tools.LyngAnalysisResult
|
||||||
|
import net.sergeych.lyng.tools.LyngLanguageTools
|
||||||
|
|
||||||
object LyngAstManager {
|
object LyngAstManager {
|
||||||
private val MINI_KEY = Key.create<MiniScript>("lyng.mini.cache")
|
private val MINI_KEY = Key.create<MiniScript>("lyng.mini.cache")
|
||||||
private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
|
private val BINDING_KEY = Key.create<BindingSnapshot>("lyng.binding.cache")
|
||||||
private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
|
private val STAMP_KEY = Key.create<Long>("lyng.mini.cache.stamp")
|
||||||
|
private val ANALYSIS_KEY = Key.create<LyngAnalysisResult>("lyng.analysis.cache")
|
||||||
|
|
||||||
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
fun getMiniAst(file: PsiFile): MiniScript? = runReadAction {
|
||||||
val vFile = file.virtualFile ?: return@runReadAction null
|
getAnalysis(file)?.mini
|
||||||
val combinedStamp = getCombinedStamp(file)
|
|
||||||
|
|
||||||
val prevStamp = file.getUserData(STAMP_KEY)
|
|
||||||
val cached = file.getUserData(MINI_KEY)
|
|
||||||
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
|
||||||
|
|
||||||
val text = file.viewProvider.contents.toString()
|
|
||||||
val sink = MiniAstBuilder()
|
|
||||||
val built = try {
|
|
||||||
val provider = IdeLenientImportProvider.create()
|
|
||||||
val src = Source(file.name, text)
|
|
||||||
runBlocking { Compiler.compileWithMini(src, provider, sink) }
|
|
||||||
val script = sink.build()
|
|
||||||
if (script != null && !file.name.endsWith(".lyng.d")) {
|
|
||||||
val dFiles = collectDeclarationFiles(file)
|
|
||||||
for (df in dFiles) {
|
|
||||||
val scriptD = getMiniAst(df)
|
|
||||||
if (scriptD != null) {
|
|
||||||
script.declarations.addAll(scriptD.declarations)
|
|
||||||
script.imports.addAll(scriptD.imports)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
script
|
|
||||||
} catch (_: Throwable) {
|
|
||||||
sink.build()
|
|
||||||
}
|
|
||||||
|
|
||||||
if (built != null) {
|
|
||||||
file.putUserData(MINI_KEY, built)
|
|
||||||
file.putUserData(STAMP_KEY, combinedStamp)
|
|
||||||
// Invalidate binding too
|
|
||||||
file.putUserData(BINDING_KEY, null)
|
|
||||||
}
|
|
||||||
built
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
fun getCombinedStamp(file: PsiFile): Long = runReadAction {
|
||||||
@@ -102,32 +69,53 @@ object LyngAstManager {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
fun getBinding(file: PsiFile): BindingSnapshot? = runReadAction {
|
||||||
|
getAnalysis(file)?.binding
|
||||||
|
}
|
||||||
|
|
||||||
|
fun getAnalysis(file: PsiFile): LyngAnalysisResult? = runReadAction {
|
||||||
val vFile = file.virtualFile ?: return@runReadAction null
|
val vFile = file.virtualFile ?: return@runReadAction null
|
||||||
var combinedStamp = file.viewProvider.modificationStamp
|
val combinedStamp = getCombinedStamp(file)
|
||||||
|
|
||||||
val dFiles = if (!file.name.endsWith(".lyng.d")) collectDeclarationFiles(file) else emptyList()
|
|
||||||
for (df in dFiles) {
|
|
||||||
combinedStamp += df.viewProvider.modificationStamp
|
|
||||||
}
|
|
||||||
|
|
||||||
val prevStamp = file.getUserData(STAMP_KEY)
|
val prevStamp = file.getUserData(STAMP_KEY)
|
||||||
val cached = file.getUserData(BINDING_KEY)
|
val cached = file.getUserData(ANALYSIS_KEY)
|
||||||
|
|
||||||
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
if (cached != null && prevStamp != null && prevStamp == combinedStamp) return@runReadAction cached
|
||||||
|
|
||||||
val mini = getMiniAst(file) ?: return@runReadAction null
|
|
||||||
val text = file.viewProvider.contents.toString()
|
val text = file.viewProvider.contents.toString()
|
||||||
val binding = try {
|
val built = try {
|
||||||
Binder.bind(text, mini)
|
val provider = IdeLenientImportProvider.create()
|
||||||
|
runBlocking {
|
||||||
|
LyngLanguageTools.analyze(
|
||||||
|
LyngAnalysisRequest(text = text, fileName = file.name, importProvider = provider)
|
||||||
|
)
|
||||||
|
}
|
||||||
} catch (_: Throwable) {
|
} catch (_: Throwable) {
|
||||||
null
|
null
|
||||||
}
|
}
|
||||||
|
|
||||||
if (binding != null) {
|
if (built != null) {
|
||||||
file.putUserData(BINDING_KEY, binding)
|
val merged = built.mini
|
||||||
// stamp is already set by getMiniAst or we set it here if getMiniAst was cached
|
if (merged != null && !file.name.endsWith(".lyng.d")) {
|
||||||
|
val dFiles = collectDeclarationFiles(file)
|
||||||
|
for (df in dFiles) {
|
||||||
|
val dAnalysis = getAnalysis(df)
|
||||||
|
val dMini = dAnalysis?.mini ?: continue
|
||||||
|
merged.declarations.addAll(dMini.declarations)
|
||||||
|
merged.imports.addAll(dMini.imports)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val finalAnalysis = if (merged != null) {
|
||||||
|
built.copy(
|
||||||
|
mini = merged,
|
||||||
|
importedModules = DocLookupUtils.canonicalImportedModules(merged, text)
|
||||||
|
)
|
||||||
|
} else {
|
||||||
|
built
|
||||||
|
}
|
||||||
|
file.putUserData(ANALYSIS_KEY, finalAnalysis)
|
||||||
|
file.putUserData(MINI_KEY, finalAnalysis.mini)
|
||||||
|
file.putUserData(BINDING_KEY, finalAnalysis.binding)
|
||||||
file.putUserData(STAMP_KEY, combinedStamp)
|
file.putUserData(STAMP_KEY, combinedStamp)
|
||||||
|
return@runReadAction finalAnalysis
|
||||||
}
|
}
|
||||||
binding
|
null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -20,8 +20,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<grazie.grammar.strategy language="Lyng"
|
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieStrategy"/>
|
|
||||||
<!-- Provide text extraction for Lyng PSI so Grazie (bundled Natural Languages) can check content -->
|
<!-- Provide text extraction for Lyng PSI so Grazie (bundled Natural Languages) can check content -->
|
||||||
<grazie.textExtractor language="Lyng"
|
<grazie.textExtractor language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -21,8 +21,6 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<grazie.grammar.strategy language="Lyng"
|
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieStrategy"/>
|
|
||||||
<!-- Provide text extraction for Lyng PSI so Grazie can actually check content -->
|
<!-- Provide text extraction for Lyng PSI so Grazie can actually check content -->
|
||||||
<grazie.textExtractor language="Lyng"
|
<grazie.textExtractor language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
implementationClass="net.sergeych.lyng.idea.grazie.LyngTextExtractor"/>
|
||||||
|
|||||||
@@ -16,8 +16,8 @@
|
|||||||
-->
|
-->
|
||||||
|
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<!-- Open-ended compatibility: 2024.3+ (build 243 and newer) -->
|
<!-- Open-ended compatibility: 2024.1+ (build 241 and newer) -->
|
||||||
<idea-version since-build="243"/>
|
<idea-version since-build="241"/>
|
||||||
<id>net.sergeych.lyng.idea</id>
|
<id>net.sergeych.lyng.idea</id>
|
||||||
<name>Lyng</name>
|
<name>Lyng</name>
|
||||||
<vendor email="real.sergeych@gmail.com">Sergey Chernov</vendor>
|
<vendor email="real.sergeych@gmail.com">Sergey Chernov</vendor>
|
||||||
@@ -57,9 +57,6 @@
|
|||||||
<!-- External annotator for semantic highlighting -->
|
<!-- External annotator for semantic highlighting -->
|
||||||
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.annotators.LyngExternalAnnotator"/>
|
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.annotators.LyngExternalAnnotator"/>
|
||||||
|
|
||||||
<!-- Grazie-backed spell/grammar annotator (runs only when Grazie is installed) -->
|
|
||||||
<externalAnnotator language="Lyng" implementationClass="net.sergeych.lyng.idea.grazie.LyngGrazieAnnotator"/>
|
|
||||||
|
|
||||||
<!-- Quick documentation provider bound to Lyng language -->
|
<!-- Quick documentation provider bound to Lyng language -->
|
||||||
<lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
|
<lang.documentationProvider language="Lyng" implementationClass="net.sergeych.lyng.idea.docs.LyngDocumentationProvider"/>
|
||||||
|
|
||||||
@@ -105,5 +102,15 @@
|
|||||||
|
|
||||||
</extensions>
|
</extensions>
|
||||||
|
|
||||||
<actions/>
|
<actions>
|
||||||
|
<action id="net.sergeych.lyng.idea.actions.RunLyngScriptAction"
|
||||||
|
class="net.sergeych.lyng.idea.actions.RunLyngScriptAction"
|
||||||
|
text="Run Lyng Script"
|
||||||
|
description="Run the current Lyng script and show output in console">
|
||||||
|
<add-to-group group-id="EditorPopupMenu" anchor="last"/>
|
||||||
|
<add-to-group group-id="ProjectViewPopupMenu" anchor="last"/>
|
||||||
|
<add-to-group group-id="RunMenu" anchor="last"/>
|
||||||
|
<keyboard-shortcut keymap="$default" first-keystroke="control shift F10"/>
|
||||||
|
</action>
|
||||||
|
</actions>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
<!--
|
<!--
|
||||||
~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
~
|
~
|
||||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
~ you may not use this file except in compliance with the License.
|
~ you may not use this file except in compliance with the License.
|
||||||
@@ -22,8 +22,7 @@
|
|||||||
-->
|
-->
|
||||||
<idea-plugin>
|
<idea-plugin>
|
||||||
<extensions defaultExtensionNs="com.intellij">
|
<extensions defaultExtensionNs="com.intellij">
|
||||||
<!-- Spellchecker strategy: identifiers + comments; literals configurable, skipping printf-like specs -->
|
|
||||||
<spellchecker.support language="Lyng"
|
<spellchecker.support language="Lyng"
|
||||||
implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
|
implementationClass="net.sergeych.lyng.idea.spell.LyngSpellcheckingStrategy"/>
|
||||||
</extensions>
|
</extensions>
|
||||||
</idea-plugin>
|
</idea-plugin>
|
||||||
@@ -1,466 +0,0 @@
|
|||||||
the
|
|
||||||
be
|
|
||||||
to
|
|
||||||
of
|
|
||||||
and
|
|
||||||
a
|
|
||||||
in
|
|
||||||
that
|
|
||||||
have
|
|
||||||
I
|
|
||||||
it
|
|
||||||
for
|
|
||||||
not
|
|
||||||
on
|
|
||||||
with
|
|
||||||
he
|
|
||||||
as
|
|
||||||
you
|
|
||||||
do
|
|
||||||
at
|
|
||||||
this
|
|
||||||
but
|
|
||||||
his
|
|
||||||
by
|
|
||||||
from
|
|
||||||
they
|
|
||||||
we
|
|
||||||
say
|
|
||||||
her
|
|
||||||
she
|
|
||||||
or
|
|
||||||
an
|
|
||||||
will
|
|
||||||
my
|
|
||||||
one
|
|
||||||
all
|
|
||||||
would
|
|
||||||
there
|
|
||||||
their
|
|
||||||
what
|
|
||||||
so
|
|
||||||
up
|
|
||||||
out
|
|
||||||
if
|
|
||||||
about
|
|
||||||
who
|
|
||||||
get
|
|
||||||
which
|
|
||||||
go
|
|
||||||
me
|
|
||||||
when
|
|
||||||
make
|
|
||||||
can
|
|
||||||
like
|
|
||||||
time
|
|
||||||
no
|
|
||||||
just
|
|
||||||
him
|
|
||||||
know
|
|
||||||
take
|
|
||||||
people
|
|
||||||
into
|
|
||||||
year
|
|
||||||
your
|
|
||||||
good
|
|
||||||
some
|
|
||||||
could
|
|
||||||
them
|
|
||||||
see
|
|
||||||
other
|
|
||||||
than
|
|
||||||
then
|
|
||||||
now
|
|
||||||
look
|
|
||||||
only
|
|
||||||
come
|
|
||||||
its
|
|
||||||
over
|
|
||||||
think
|
|
||||||
also
|
|
||||||
back
|
|
||||||
after
|
|
||||||
use
|
|
||||||
two
|
|
||||||
how
|
|
||||||
our
|
|
||||||
work
|
|
||||||
first
|
|
||||||
well
|
|
||||||
way
|
|
||||||
even
|
|
||||||
new
|
|
||||||
want
|
|
||||||
because
|
|
||||||
any
|
|
||||||
these
|
|
||||||
give
|
|
||||||
day
|
|
||||||
most
|
|
||||||
us
|
|
||||||
is
|
|
||||||
are
|
|
||||||
was
|
|
||||||
were
|
|
||||||
been
|
|
||||||
being
|
|
||||||
does
|
|
||||||
did
|
|
||||||
done
|
|
||||||
has
|
|
||||||
had
|
|
||||||
having
|
|
||||||
may
|
|
||||||
might
|
|
||||||
must
|
|
||||||
shall
|
|
||||||
should
|
|
||||||
ought
|
|
||||||
need
|
|
||||||
used
|
|
||||||
here
|
|
||||||
therefore
|
|
||||||
where
|
|
||||||
why
|
|
||||||
while
|
|
||||||
until
|
|
||||||
since
|
|
||||||
before
|
|
||||||
afterward
|
|
||||||
between
|
|
||||||
among
|
|
||||||
without
|
|
||||||
within
|
|
||||||
through
|
|
||||||
across
|
|
||||||
against
|
|
||||||
toward
|
|
||||||
upon
|
|
||||||
above
|
|
||||||
below
|
|
||||||
under
|
|
||||||
around
|
|
||||||
near
|
|
||||||
far
|
|
||||||
early
|
|
||||||
late
|
|
||||||
often
|
|
||||||
always
|
|
||||||
never
|
|
||||||
seldom
|
|
||||||
sometimes
|
|
||||||
usually
|
|
||||||
really
|
|
||||||
very
|
|
||||||
quite
|
|
||||||
rather
|
|
||||||
almost
|
|
||||||
already
|
|
||||||
again
|
|
||||||
still
|
|
||||||
yet
|
|
||||||
soon
|
|
||||||
today
|
|
||||||
tomorrow
|
|
||||||
yesterday
|
|
||||||
number
|
|
||||||
string
|
|
||||||
boolean
|
|
||||||
true
|
|
||||||
false
|
|
||||||
null
|
|
||||||
none
|
|
||||||
file
|
|
||||||
files
|
|
||||||
path
|
|
||||||
paths
|
|
||||||
line
|
|
||||||
lines
|
|
||||||
word
|
|
||||||
words
|
|
||||||
count
|
|
||||||
value
|
|
||||||
values
|
|
||||||
name
|
|
||||||
names
|
|
||||||
title
|
|
||||||
text
|
|
||||||
message
|
|
||||||
error
|
|
||||||
errors
|
|
||||||
warning
|
|
||||||
warnings
|
|
||||||
info
|
|
||||||
information
|
|
||||||
debug
|
|
||||||
trace
|
|
||||||
format
|
|
||||||
printf
|
|
||||||
specifier
|
|
||||||
specifiers
|
|
||||||
pattern
|
|
||||||
patterns
|
|
||||||
match
|
|
||||||
matches
|
|
||||||
regex
|
|
||||||
version
|
|
||||||
versions
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
package
|
|
||||||
packages
|
|
||||||
import
|
|
||||||
imports
|
|
||||||
export
|
|
||||||
exports
|
|
||||||
class
|
|
||||||
classes
|
|
||||||
object
|
|
||||||
objects
|
|
||||||
function
|
|
||||||
functions
|
|
||||||
method
|
|
||||||
methods
|
|
||||||
parameter
|
|
||||||
parameters
|
|
||||||
argument
|
|
||||||
arguments
|
|
||||||
variable
|
|
||||||
variables
|
|
||||||
constant
|
|
||||||
constants
|
|
||||||
type
|
|
||||||
types
|
|
||||||
generic
|
|
||||||
generics
|
|
||||||
map
|
|
||||||
maps
|
|
||||||
list
|
|
||||||
lists
|
|
||||||
array
|
|
||||||
arrays
|
|
||||||
set
|
|
||||||
sets
|
|
||||||
queue
|
|
||||||
stack
|
|
||||||
graph
|
|
||||||
tree
|
|
||||||
node
|
|
||||||
nodes
|
|
||||||
edge
|
|
||||||
edges
|
|
||||||
pair
|
|
||||||
pairs
|
|
||||||
key
|
|
||||||
keys
|
|
||||||
value
|
|
||||||
values
|
|
||||||
index
|
|
||||||
indices
|
|
||||||
length
|
|
||||||
size
|
|
||||||
empty
|
|
||||||
contains
|
|
||||||
equals
|
|
||||||
compare
|
|
||||||
greater
|
|
||||||
less
|
|
||||||
minimum
|
|
||||||
maximum
|
|
||||||
average
|
|
||||||
sum
|
|
||||||
total
|
|
||||||
random
|
|
||||||
round
|
|
||||||
floor
|
|
||||||
ceil
|
|
||||||
sin
|
|
||||||
cos
|
|
||||||
tan
|
|
||||||
sqrt
|
|
||||||
abs
|
|
||||||
min
|
|
||||||
max
|
|
||||||
read
|
|
||||||
write
|
|
||||||
open
|
|
||||||
close
|
|
||||||
append
|
|
||||||
create
|
|
||||||
delete
|
|
||||||
remove
|
|
||||||
update
|
|
||||||
save
|
|
||||||
load
|
|
||||||
start
|
|
||||||
stop
|
|
||||||
run
|
|
||||||
execute
|
|
||||||
return
|
|
||||||
break
|
|
||||||
continue
|
|
||||||
try
|
|
||||||
catch
|
|
||||||
finally
|
|
||||||
throw
|
|
||||||
throws
|
|
||||||
if
|
|
||||||
else
|
|
||||||
when
|
|
||||||
while
|
|
||||||
for
|
|
||||||
loop
|
|
||||||
range
|
|
||||||
case
|
|
||||||
switch
|
|
||||||
default
|
|
||||||
optional
|
|
||||||
required
|
|
||||||
enable
|
|
||||||
disable
|
|
||||||
enabled
|
|
||||||
disabled
|
|
||||||
visible
|
|
||||||
hidden
|
|
||||||
public
|
|
||||||
private
|
|
||||||
protected
|
|
||||||
internal
|
|
||||||
external
|
|
||||||
inline
|
|
||||||
override
|
|
||||||
abstract
|
|
||||||
sealed
|
|
||||||
open
|
|
||||||
final
|
|
||||||
static
|
|
||||||
const
|
|
||||||
lazy
|
|
||||||
late
|
|
||||||
init
|
|
||||||
initialize
|
|
||||||
configuration
|
|
||||||
settings
|
|
||||||
option
|
|
||||||
options
|
|
||||||
preference
|
|
||||||
preferences
|
|
||||||
project
|
|
||||||
projects
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
build
|
|
||||||
builds
|
|
||||||
compile
|
|
||||||
compiles
|
|
||||||
compiler
|
|
||||||
test
|
|
||||||
tests
|
|
||||||
testing
|
|
||||||
assert
|
|
||||||
assertion
|
|
||||||
result
|
|
||||||
results
|
|
||||||
success
|
|
||||||
failure
|
|
||||||
status
|
|
||||||
state
|
|
||||||
context
|
|
||||||
scope
|
|
||||||
scopes
|
|
||||||
token
|
|
||||||
tokens
|
|
||||||
identifier
|
|
||||||
identifiers
|
|
||||||
keyword
|
|
||||||
keywords
|
|
||||||
comment
|
|
||||||
comments
|
|
||||||
string
|
|
||||||
strings
|
|
||||||
literal
|
|
||||||
literals
|
|
||||||
formatting
|
|
||||||
formatter
|
|
||||||
spell
|
|
||||||
spelling
|
|
||||||
dictionary
|
|
||||||
dictionaries
|
|
||||||
language
|
|
||||||
languages
|
|
||||||
natural
|
|
||||||
grazie
|
|
||||||
typo
|
|
||||||
typos
|
|
||||||
suggest
|
|
||||||
suggestion
|
|
||||||
suggestions
|
|
||||||
replace
|
|
||||||
replacement
|
|
||||||
replacements
|
|
||||||
learn
|
|
||||||
learned
|
|
||||||
learns
|
|
||||||
filter
|
|
||||||
filters
|
|
||||||
exclude
|
|
||||||
excludes
|
|
||||||
include
|
|
||||||
includes
|
|
||||||
bundle
|
|
||||||
bundled
|
|
||||||
resource
|
|
||||||
resources
|
|
||||||
gzipped
|
|
||||||
plain
|
|
||||||
text
|
|
||||||
editor
|
|
||||||
editors
|
|
||||||
inspection
|
|
||||||
inspections
|
|
||||||
highlight
|
|
||||||
highlighting
|
|
||||||
underline
|
|
||||||
underlines
|
|
||||||
style
|
|
||||||
styles
|
|
||||||
range
|
|
||||||
ranges
|
|
||||||
offset
|
|
||||||
offsets
|
|
||||||
position
|
|
||||||
positions
|
|
||||||
apply
|
|
||||||
applies
|
|
||||||
provides
|
|
||||||
present
|
|
||||||
absent
|
|
||||||
available
|
|
||||||
unavailable
|
|
||||||
version
|
|
||||||
build
|
|
||||||
platform
|
|
||||||
ide
|
|
||||||
intellij
|
|
||||||
plugin
|
|
||||||
plugins
|
|
||||||
sandbox
|
|
||||||
gradle
|
|
||||||
kotlin
|
|
||||||
java
|
|
||||||
linux
|
|
||||||
macos
|
|
||||||
windows
|
|
||||||
unix
|
|
||||||
system
|
|
||||||
systems
|
|
||||||
support
|
|
||||||
supports
|
|
||||||
compatible
|
|
||||||
compatibility
|
|
||||||
fallback
|
|
||||||
native
|
|
||||||
automatic
|
|
||||||
autoswitch
|
|
||||||
switch
|
|
||||||
switches
|
|
||||||
@@ -1,282 +0,0 @@
|
|||||||
# Lyng/tech vocabulary – one word per line, lowercase
|
|
||||||
lyng
|
|
||||||
miniast
|
|
||||||
binder
|
|
||||||
printf
|
|
||||||
specifier
|
|
||||||
specifiers
|
|
||||||
regex
|
|
||||||
regexp
|
|
||||||
token
|
|
||||||
tokens
|
|
||||||
lexer
|
|
||||||
parser
|
|
||||||
syntax
|
|
||||||
semantic
|
|
||||||
highlight
|
|
||||||
highlighting
|
|
||||||
underline
|
|
||||||
typo
|
|
||||||
typos
|
|
||||||
dictionary
|
|
||||||
dictionaries
|
|
||||||
grazie
|
|
||||||
natural
|
|
||||||
languages
|
|
||||||
inspection
|
|
||||||
inspections
|
|
||||||
annotation
|
|
||||||
annotator
|
|
||||||
annotations
|
|
||||||
quickfix
|
|
||||||
quickfixes
|
|
||||||
intention
|
|
||||||
intentions
|
|
||||||
replacement
|
|
||||||
replacements
|
|
||||||
identifier
|
|
||||||
identifiers
|
|
||||||
keyword
|
|
||||||
keywords
|
|
||||||
comment
|
|
||||||
comments
|
|
||||||
string
|
|
||||||
strings
|
|
||||||
literal
|
|
||||||
literals
|
|
||||||
formatting
|
|
||||||
formatter
|
|
||||||
splitter
|
|
||||||
camelcase
|
|
||||||
snakecase
|
|
||||||
pascalcase
|
|
||||||
uppercase
|
|
||||||
lowercase
|
|
||||||
titlecase
|
|
||||||
case
|
|
||||||
cases
|
|
||||||
project
|
|
||||||
module
|
|
||||||
modules
|
|
||||||
resource
|
|
||||||
resources
|
|
||||||
bundle
|
|
||||||
bundled
|
|
||||||
gzipped
|
|
||||||
plaintext
|
|
||||||
text
|
|
||||||
range
|
|
||||||
ranges
|
|
||||||
offset
|
|
||||||
offsets
|
|
||||||
position
|
|
||||||
positions
|
|
||||||
apply
|
|
||||||
applies
|
|
||||||
runtime
|
|
||||||
compile
|
|
||||||
build
|
|
||||||
artifact
|
|
||||||
artifacts
|
|
||||||
plugin
|
|
||||||
plugins
|
|
||||||
intellij
|
|
||||||
idea
|
|
||||||
sandbox
|
|
||||||
gradle
|
|
||||||
kotlin
|
|
||||||
java
|
|
||||||
jvm
|
|
||||||
coroutines
|
|
||||||
suspend
|
|
||||||
scope
|
|
||||||
scopes
|
|
||||||
context
|
|
||||||
contexts
|
|
||||||
tokenizer
|
|
||||||
tokenizers
|
|
||||||
spell
|
|
||||||
spelling
|
|
||||||
spellcheck
|
|
||||||
spellchecker
|
|
||||||
fallback
|
|
||||||
native
|
|
||||||
autoswitch
|
|
||||||
switch
|
|
||||||
switching
|
|
||||||
enable
|
|
||||||
disable
|
|
||||||
enabled
|
|
||||||
disabled
|
|
||||||
setting
|
|
||||||
settings
|
|
||||||
preference
|
|
||||||
preferences
|
|
||||||
editor
|
|
||||||
filetype
|
|
||||||
filetypes
|
|
||||||
language
|
|
||||||
languages
|
|
||||||
psi
|
|
||||||
psielement
|
|
||||||
psifile
|
|
||||||
textcontent
|
|
||||||
textdomain
|
|
||||||
stealth
|
|
||||||
stealthy
|
|
||||||
printfspec
|
|
||||||
format
|
|
||||||
formats
|
|
||||||
pattern
|
|
||||||
patterns
|
|
||||||
match
|
|
||||||
matches
|
|
||||||
group
|
|
||||||
groups
|
|
||||||
node
|
|
||||||
nodes
|
|
||||||
tree
|
|
||||||
graph
|
|
||||||
edge
|
|
||||||
edges
|
|
||||||
pair
|
|
||||||
pairs
|
|
||||||
map
|
|
||||||
maps
|
|
||||||
list
|
|
||||||
lists
|
|
||||||
array
|
|
||||||
arrays
|
|
||||||
set
|
|
||||||
sets
|
|
||||||
queue
|
|
||||||
stack
|
|
||||||
index
|
|
||||||
indices
|
|
||||||
length
|
|
||||||
size
|
|
||||||
empty
|
|
||||||
contains
|
|
||||||
equals
|
|
||||||
compare
|
|
||||||
greater
|
|
||||||
less
|
|
||||||
minimum
|
|
||||||
maximum
|
|
||||||
average
|
|
||||||
sum
|
|
||||||
total
|
|
||||||
random
|
|
||||||
round
|
|
||||||
floor
|
|
||||||
ceil
|
|
||||||
sin
|
|
||||||
cos
|
|
||||||
tan
|
|
||||||
sqrt
|
|
||||||
abs
|
|
||||||
min
|
|
||||||
max
|
|
||||||
read
|
|
||||||
write
|
|
||||||
open
|
|
||||||
close
|
|
||||||
append
|
|
||||||
create
|
|
||||||
delete
|
|
||||||
remove
|
|
||||||
update
|
|
||||||
save
|
|
||||||
load
|
|
||||||
start
|
|
||||||
stop
|
|
||||||
run
|
|
||||||
execute
|
|
||||||
return
|
|
||||||
break
|
|
||||||
continue
|
|
||||||
try
|
|
||||||
catch
|
|
||||||
finally
|
|
||||||
throw
|
|
||||||
throws
|
|
||||||
if
|
|
||||||
else
|
|
||||||
when
|
|
||||||
while
|
|
||||||
for
|
|
||||||
loop
|
|
||||||
rangeop
|
|
||||||
caseop
|
|
||||||
switchop
|
|
||||||
default
|
|
||||||
optional
|
|
||||||
required
|
|
||||||
public
|
|
||||||
private
|
|
||||||
protected
|
|
||||||
internal
|
|
||||||
external
|
|
||||||
inline
|
|
||||||
override
|
|
||||||
abstract
|
|
||||||
sealed
|
|
||||||
open
|
|
||||||
final
|
|
||||||
static
|
|
||||||
const
|
|
||||||
lazy
|
|
||||||
late
|
|
||||||
init
|
|
||||||
initialize
|
|
||||||
configuration
|
|
||||||
option
|
|
||||||
options
|
|
||||||
projectwide
|
|
||||||
workspace
|
|
||||||
crossplatform
|
|
||||||
multiplatform
|
|
||||||
commonmain
|
|
||||||
jsmain
|
|
||||||
native
|
|
||||||
platform
|
|
||||||
api
|
|
||||||
implementation
|
|
||||||
dependency
|
|
||||||
dependencies
|
|
||||||
classpath
|
|
||||||
source
|
|
||||||
sources
|
|
||||||
document
|
|
||||||
documents
|
|
||||||
logging
|
|
||||||
logger
|
|
||||||
info
|
|
||||||
debug
|
|
||||||
trace
|
|
||||||
warning
|
|
||||||
error
|
|
||||||
severity
|
|
||||||
severitylevel
|
|
||||||
intentionaction
|
|
||||||
daemon
|
|
||||||
daemoncodeanalyzer
|
|
||||||
restart
|
|
||||||
textattributes
|
|
||||||
textattributeskey
|
|
||||||
typostyle
|
|
||||||
learned
|
|
||||||
learn
|
|
||||||
tech
|
|
||||||
vocabulary
|
|
||||||
domain
|
|
||||||
term
|
|
||||||
terms
|
|
||||||
us
|
|
||||||
uk
|
|
||||||
american
|
|
||||||
british
|
|
||||||
colour
|
|
||||||
color
|
|
||||||
organisation
|
|
||||||
organization
|
|
||||||
+54
@@ -1,3 +1,20 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
package net.sergeych.lyng.idea.completion
|
package net.sergeych.lyng.idea.completion
|
||||||
|
|
||||||
import com.intellij.testFramework.fixtures.BasePlatformTestCase
|
import com.intellij.testFramework.fixtures.BasePlatformTestCase
|
||||||
@@ -118,4 +135,41 @@ class LyngCompletionMemberTest : BasePlatformTestCase() {
|
|||||||
// Heuristic: we expect more than a couple of items (not just size/toList)
|
// Heuristic: we expect more than a couple of items (not just size/toList)
|
||||||
assertTrue("Too few member suggestions after list literal: $items", items.size >= 3)
|
assertTrue("Too few member suggestions after list literal: $items", items.size >= 3)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun test_ProcessModule_Completion() {
|
||||||
|
val code = """
|
||||||
|
import lyng.io.process
|
||||||
|
Process.<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
val imported = listOf("lyng.io.process")
|
||||||
|
ensureDocs(imported)
|
||||||
|
|
||||||
|
val items = complete(code)
|
||||||
|
assertTrue("Should contain 'execute'", items.contains("execute"))
|
||||||
|
assertTrue("Should contain 'shell'", items.contains("shell"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_RunningProcess_Completion() {
|
||||||
|
val code = """
|
||||||
|
import lyng.io.process
|
||||||
|
val p = Process.shell("ls")
|
||||||
|
p.<caret>
|
||||||
|
""".trimIndent()
|
||||||
|
val imported = listOf("lyng.io.process")
|
||||||
|
ensureDocs(imported)
|
||||||
|
|
||||||
|
val items = complete(code)
|
||||||
|
assertTrue("Should contain 'stdout'", items.contains("stdout"))
|
||||||
|
assertTrue("Should contain 'waitFor'", items.contains("waitFor"))
|
||||||
|
assertTrue("Should contain 'signal'", items.contains("signal"))
|
||||||
|
}
|
||||||
|
|
||||||
|
fun test_RegistryDirect() {
|
||||||
|
DocsBootstrap.ensure()
|
||||||
|
val docs = BuiltinDocRegistry.docsForModule("lyng.io.process")
|
||||||
|
assertTrue("Docs for lyng.io.process should not be empty", docs.isNotEmpty())
|
||||||
|
val processClass = docs.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "Process" }
|
||||||
|
assertNotNull("Should contain Process class", processClass)
|
||||||
|
assertTrue("Process should have members", processClass!!.members.isNotEmpty())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -27,6 +27,7 @@ import com.github.ajalt.clikt.parameters.arguments.optional
|
|||||||
import com.github.ajalt.clikt.parameters.options.flag
|
import com.github.ajalt.clikt.parameters.options.flag
|
||||||
import com.github.ajalt.clikt.parameters.options.option
|
import com.github.ajalt.clikt.parameters.options.option
|
||||||
import kotlinx.coroutines.runBlocking
|
import kotlinx.coroutines.runBlocking
|
||||||
|
import net.sergeych.lyng.Compiler
|
||||||
import net.sergeych.lyng.LyngVersion
|
import net.sergeych.lyng.LyngVersion
|
||||||
import net.sergeych.lyng.Script
|
import net.sergeych.lyng.Script
|
||||||
import net.sergeych.lyng.ScriptError
|
import net.sergeych.lyng.ScriptError
|
||||||
@@ -167,7 +168,7 @@ private class Lyng(val launcher: (suspend () -> Unit) -> Unit) : CliktCommand()
|
|||||||
|
|
||||||
override fun help(context: Context): String =
|
override fun help(context: Context): String =
|
||||||
"""
|
"""
|
||||||
The Lyng script language interpreter, language version is $LyngVersion.
|
The Lyng script language runtime, language version is $LyngVersion.
|
||||||
|
|
||||||
Please refer form more information to the project site:
|
Please refer form more information to the project site:
|
||||||
https://gitea.sergeych.net/SergeychWorks/lyng
|
https://gitea.sergeych.net/SergeychWorks/lyng
|
||||||
@@ -198,7 +199,12 @@ private class Lyng(val launcher: (suspend () -> Unit) -> Unit) : CliktCommand()
|
|||||||
launcher {
|
launcher {
|
||||||
// there is no script name, it is a first argument instead:
|
// there is no script name, it is a first argument instead:
|
||||||
processErrors {
|
processErrors {
|
||||||
baseScope.eval(execute!!)
|
val script = Compiler.compileWithResolution(
|
||||||
|
Source("<eval>", execute!!),
|
||||||
|
baseScope.currentImportProvider,
|
||||||
|
seedScope = baseScope
|
||||||
|
)
|
||||||
|
script.execute(baseScope)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -236,7 +242,13 @@ suspend fun executeFile(fileName: String) {
|
|||||||
text = text.substring(pos + 1)
|
text = text.substring(pos + 1)
|
||||||
}
|
}
|
||||||
processErrors {
|
processErrors {
|
||||||
baseScopeDefer.await().eval(Source(fileName, text))
|
val scope = baseScopeDefer.await()
|
||||||
|
val script = Compiler.compileWithResolution(
|
||||||
|
Source(fileName, text),
|
||||||
|
scope.currentImportProvider,
|
||||||
|
seedScope = scope
|
||||||
|
)
|
||||||
|
script.execute(scope)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -56,7 +56,7 @@ class FsIntegrationJvmTest {
|
|||||||
"""
|
"""
|
||||||
import lyng.io.fs
|
import lyng.io.fs
|
||||||
// list current folder files
|
// list current folder files
|
||||||
println( Path(".").list().toList() )
|
println( Path(".").list() )
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -32,6 +32,7 @@ group = "net.sergeych"
|
|||||||
version = "0.0.1-SNAPSHOT"
|
version = "0.0.1-SNAPSHOT"
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
jvm()
|
jvm()
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishLibraryVariants("release")
|
publishLibraryVariants("release")
|
||||||
|
|||||||
@@ -23,6 +23,8 @@ package net.sergeych.lyng.io.fs
|
|||||||
|
|
||||||
import net.sergeych.lyng.ModuleScope
|
import net.sergeych.lyng.ModuleScope
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.ScopeFacade
|
||||||
|
import net.sergeych.lyng.requireScope
|
||||||
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
|
||||||
@@ -437,7 +439,7 @@ private suspend fun buildFsModule(module: ModuleScope, policy: FsAccessPolicy) {
|
|||||||
moduleName = module.packageName
|
moduleName = module.packageName
|
||||||
) {
|
) {
|
||||||
fsGuard {
|
fsGuard {
|
||||||
val chunkIt = thisObj.invokeInstanceMethod(this, "readUtf8Chunks")
|
val chunkIt = thisObj.invokeInstanceMethod(requireScope(), "readUtf8Chunks")
|
||||||
ObjFsLinesIterator(chunkIt)
|
ObjFsLinesIterator(chunkIt)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -463,7 +465,7 @@ private suspend fun buildFsModule(module: ModuleScope, policy: FsAccessPolicy) {
|
|||||||
|
|
||||||
// --- Helper classes and utilities ---
|
// --- Helper classes and utilities ---
|
||||||
|
|
||||||
private fun parsePathArg(scope: Scope, self: ObjPath, arg: Obj): LyngPath {
|
private fun parsePathArg(scope: ScopeFacade, self: ObjPath, arg: Obj): LyngPath {
|
||||||
return when (arg) {
|
return when (arg) {
|
||||||
is ObjString -> arg.value.toPath()
|
is ObjString -> arg.value.toPath()
|
||||||
is ObjPath -> arg.path
|
is ObjPath -> arg.path
|
||||||
@@ -472,11 +474,11 @@ private fun parsePathArg(scope: Scope, self: ObjPath, arg: Obj): LyngPath {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Map Fs access denials to Lyng runtime exceptions for script-friendly errors
|
// Map Fs access denials to Lyng runtime exceptions for script-friendly errors
|
||||||
private suspend inline fun Scope.fsGuard(crossinline block: suspend () -> Obj): Obj {
|
private suspend inline fun ScopeFacade.fsGuard(crossinline block: suspend () -> Obj): Obj {
|
||||||
return try {
|
return try {
|
||||||
block()
|
block()
|
||||||
} catch (e: AccessDeniedException) {
|
} catch (e: AccessDeniedException) {
|
||||||
raiseError(ObjIllegalOperationException(this, e.reasonDetail ?: "access denied"))
|
raiseError(ObjIllegalOperationException(requireScope(), e.reasonDetail ?: "access denied"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -668,16 +670,17 @@ class ObjFsLinesIterator(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend fun ensureBufferFilled(scope: Scope) {
|
private suspend fun ensureBufferFilled(scope: ScopeFacade) {
|
||||||
if (buffer.contains('\n') || exhausted) return
|
if (buffer.contains('\n') || exhausted) return
|
||||||
|
val actualScope = scope.requireScope()
|
||||||
// Pull next chunk from the underlying iterator
|
// Pull next chunk from the underlying iterator
|
||||||
val it = chunksIterator.invokeInstanceMethod(scope, "iterator")
|
val it = chunksIterator.invokeInstanceMethod(actualScope, "iterator")
|
||||||
val hasNext = it.invokeInstanceMethod(scope, "hasNext").toBool()
|
val hasNext = it.invokeInstanceMethod(actualScope, "hasNext").toBool()
|
||||||
if (!hasNext) {
|
if (!hasNext) {
|
||||||
exhausted = true
|
exhausted = true
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
val next = it.invokeInstanceMethod(scope, "next")
|
val next = it.invokeInstanceMethod(actualScope, "next")
|
||||||
buffer += next.toString()
|
buffer += next.toString()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,10 +20,11 @@ package net.sergeych.lyng.io.process
|
|||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
import net.sergeych.lyng.ModuleScope
|
import net.sergeych.lyng.ModuleScope
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.ScopeFacade
|
||||||
|
import net.sergeych.lyng.requireScope
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
import net.sergeych.lyng.pacman.ImportManager
|
import net.sergeych.lyng.pacman.ImportManager
|
||||||
import net.sergeych.lyng.statement
|
|
||||||
import net.sergeych.lyngio.process.*
|
import net.sergeych.lyngio.process.*
|
||||||
import net.sergeych.lyngio.process.security.ProcessAccessDeniedException
|
import net.sergeych.lyngio.process.security.ProcessAccessDeniedException
|
||||||
import net.sergeych.lyngio.process.security.ProcessAccessPolicy
|
import net.sergeych.lyngio.process.security.ProcessAccessPolicy
|
||||||
@@ -205,20 +206,21 @@ class ObjRunningProcess(
|
|||||||
override fun toString(): String = "RunningProcess($process)"
|
override fun toString(): String = "RunningProcess($process)"
|
||||||
}
|
}
|
||||||
|
|
||||||
private suspend inline fun Scope.processGuard(crossinline block: suspend () -> Obj): Obj {
|
private suspend inline fun ScopeFacade.processGuard(crossinline block: suspend () -> Obj): Obj {
|
||||||
return try {
|
return try {
|
||||||
block()
|
block()
|
||||||
} catch (e: ProcessAccessDeniedException) {
|
} catch (e: ProcessAccessDeniedException) {
|
||||||
raiseError(ObjIllegalOperationException(this, e.reasonDetail ?: "process access denied"))
|
raiseError(ObjIllegalOperationException(requireScope(), e.reasonDetail ?: "process access denied"))
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
raiseError(ObjIllegalOperationException(this, e.message ?: "process error"))
|
raiseError(ObjIllegalOperationException(requireScope(), e.message ?: "process error"))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun Flow<String>.toLyngFlow(flowScope: Scope): ObjFlow {
|
private fun Flow<String>.toLyngFlow(flowScope: ScopeFacade): ObjFlow {
|
||||||
val producer = statement {
|
val producer = net.sergeych.lyng.obj.ObjExternCallable.fromBridge {
|
||||||
val builder = (this as? net.sergeych.lyng.ClosureScope)?.callScope?.thisObj as? ObjFlowBuilder
|
val scope = requireScope()
|
||||||
?: this.thisObj as? ObjFlowBuilder
|
val builder = (scope as? net.sergeych.lyng.BytecodeClosureScope)?.callScope?.thisObj as? ObjFlowBuilder
|
||||||
|
?: scope.thisObj as? ObjFlowBuilder
|
||||||
|
|
||||||
this@toLyngFlow.collect {
|
this@toLyngFlow.collect {
|
||||||
try {
|
try {
|
||||||
@@ -230,5 +232,5 @@ private fun Flow<String>.toLyngFlow(flowScope: Scope): ObjFlow {
|
|||||||
}
|
}
|
||||||
ObjVoid
|
ObjVoid
|
||||||
}
|
}
|
||||||
return ObjFlow(producer, flowScope)
|
return ObjFlow(producer, flowScope.requireScope())
|
||||||
}
|
}
|
||||||
@@ -39,43 +39,174 @@ object FsBuiltinDocs {
|
|||||||
name = "Path",
|
name = "Path",
|
||||||
doc = "Filesystem path class. Construct with a string: `Path(\"/tmp\")`."
|
doc = "Filesystem path class. Construct with a string: `Path(\"/tmp\")`."
|
||||||
) {
|
) {
|
||||||
// Common instance methods (subset sufficient for Quick Docs)
|
method(
|
||||||
|
name = "name",
|
||||||
|
doc = "Base name of the path (last segment).",
|
||||||
|
returns = type("lyng.String")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "parent",
|
||||||
|
doc = "Parent directory as a Path or null if none.",
|
||||||
|
returns = type("Path", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "segments",
|
||||||
|
doc = "List of path segments.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.List"), listOf(type("lyng.String")))
|
||||||
|
)
|
||||||
method(
|
method(
|
||||||
name = "exists",
|
name = "exists",
|
||||||
doc = "Whether the path exists on the filesystem.",
|
doc = "Check whether this path exists on the filesystem.",
|
||||||
returns = type("lyng.Bool")
|
returns = type("lyng.Bool")
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "isFile",
|
name = "isFile",
|
||||||
doc = "Whether the path exists and is a file.",
|
doc = "True if this path is a regular file (based on cached metadata).",
|
||||||
returns = type("lyng.Bool")
|
returns = type("lyng.Bool")
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "isDir",
|
name = "isDirectory",
|
||||||
doc = "Whether the path exists and is a directory.",
|
doc = "True if this path is a directory (based on cached metadata).",
|
||||||
returns = type("lyng.Bool")
|
returns = type("lyng.Bool")
|
||||||
)
|
)
|
||||||
|
method(
|
||||||
|
name = "size",
|
||||||
|
doc = "File size in bytes, or null when unavailable.",
|
||||||
|
returns = type("lyng.Int", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "createdAt",
|
||||||
|
doc = "Creation time as `Instant`, or null when unavailable.",
|
||||||
|
returns = type("lyng.Instant", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "createdAtMillis",
|
||||||
|
doc = "Creation time in milliseconds since epoch, or null when unavailable.",
|
||||||
|
returns = type("lyng.Int", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "modifiedAt",
|
||||||
|
doc = "Last modification time as `Instant`, or null when unavailable.",
|
||||||
|
returns = type("lyng.Instant", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "modifiedAtMillis",
|
||||||
|
doc = "Last modification time in milliseconds since epoch, or null when unavailable.",
|
||||||
|
returns = type("lyng.Int", nullable = true)
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "list",
|
||||||
|
doc = "List directory entries as `Path` objects.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.List"), listOf(type("Path")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "readBytes",
|
||||||
|
doc = "Read the entire file into a binary buffer.",
|
||||||
|
returns = type("lyng.Buffer")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "writeBytes",
|
||||||
|
doc = "Write a binary buffer to the file, replacing content.",
|
||||||
|
params = listOf(ParamDoc("bytes", type("lyng.Buffer")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "appendBytes",
|
||||||
|
doc = "Append a binary buffer to the end of the file.",
|
||||||
|
params = listOf(ParamDoc("bytes", type("lyng.Buffer")))
|
||||||
|
)
|
||||||
method(
|
method(
|
||||||
name = "readUtf8",
|
name = "readUtf8",
|
||||||
doc = "Read the entire file as UTF-8 string.",
|
doc = "Read the entire file as a UTF-8 string.",
|
||||||
returns = type("lyng.String")
|
returns = type("lyng.String")
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "writeUtf8",
|
name = "writeUtf8",
|
||||||
doc = "Write UTF-8 string to the file (overwrite).",
|
doc = "Write a UTF-8 string to the file, replacing content.",
|
||||||
params = listOf(ParamDoc("text", type("lyng.String")))
|
params = listOf(ParamDoc("text", type("lyng.String")))
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "bytes",
|
name = "appendUtf8",
|
||||||
doc = "Iterate file content as `Buffer` chunks.",
|
doc = "Append UTF-8 text to the end of the file.",
|
||||||
|
params = listOf(ParamDoc("text", type("lyng.String")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "metadata",
|
||||||
|
doc = "Fetch cached metadata as a map of fields: `isFile`, `isDirectory`, `size`, `createdAtMillis`, `modifiedAtMillis`, `isSymlink`.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.Map"), listOf(type("lyng.String"), type("lyng.Any")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "mkdirs",
|
||||||
|
doc = "Create directories (like `mkdir -p`). If `mustCreate` is true and the path already exists, the call fails.",
|
||||||
|
params = listOf(ParamDoc("mustCreate", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "move",
|
||||||
|
doc = "Move this path to a new location. `to` may be a `Path` or `String`.",
|
||||||
|
params = listOf(ParamDoc("to"), ParamDoc("overwrite", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "delete",
|
||||||
|
doc = "Delete this path. `recursively=true` removes directories with their contents.",
|
||||||
|
params = listOf(ParamDoc("mustExist", type("lyng.Bool")), ParamDoc("recursively", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "copy",
|
||||||
|
doc = "Copy this path to a new location. `to` may be a `Path` or `String`.",
|
||||||
|
params = listOf(ParamDoc("to"), ParamDoc("overwrite", type("lyng.Bool")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "glob",
|
||||||
|
doc = "List entries matching a glob pattern (no recursion).",
|
||||||
|
params = listOf(ParamDoc("pattern", type("lyng.String"))),
|
||||||
|
returns = TypeGenericDoc(type("lyng.List"), listOf(type("Path")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "readChunks",
|
||||||
|
doc = "Read file in fixed-size chunks as an iterator of `Buffer`.",
|
||||||
params = listOf(ParamDoc("size", type("lyng.Int"))),
|
params = listOf(ParamDoc("size", type("lyng.Int"))),
|
||||||
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.Buffer")))
|
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.Buffer")))
|
||||||
)
|
)
|
||||||
method(
|
method(
|
||||||
name = "lines",
|
name = "readUtf8Chunks",
|
||||||
doc = "Iterate file as lines of text.",
|
doc = "Read UTF-8 text in fixed-size chunks as an iterator of `String`.",
|
||||||
|
params = listOf(ParamDoc("size", type("lyng.Int"))),
|
||||||
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.String")))
|
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.String")))
|
||||||
)
|
)
|
||||||
|
method(
|
||||||
|
name = "lines",
|
||||||
|
doc = "Iterate lines of the file as `String` values.",
|
||||||
|
returns = TypeGenericDoc(type("lyng.Iterator"), listOf(type("lyng.String")))
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "BytesIterator",
|
||||||
|
doc = "Iterator over binary chunks."
|
||||||
|
) {
|
||||||
|
method("iterator", "Return this iterator instance.", returns = type("BytesIterator"))
|
||||||
|
method("hasNext", "Whether there is another chunk available.", returns = type("lyng.Bool"))
|
||||||
|
method("next", "Return the next chunk as a `Buffer`.", returns = type("lyng.Buffer"))
|
||||||
|
method("cancelIteration", "Stop the iteration early.")
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "StringChunksIterator",
|
||||||
|
doc = "Iterator over UTF-8 text chunks."
|
||||||
|
) {
|
||||||
|
method("iterator", "Return this iterator instance.", returns = type("StringChunksIterator"))
|
||||||
|
method("hasNext", "Whether there is another chunk available.", returns = type("lyng.Bool"))
|
||||||
|
method("next", "Return the next UTF-8 chunk as a `String`.", returns = type("lyng.String"))
|
||||||
|
method("cancelIteration", "Stop the iteration early.")
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "LinesIterator",
|
||||||
|
doc = "Iterator that yields lines of text."
|
||||||
|
) {
|
||||||
|
method("iterator", "Return this iterator instance.", returns = type("LinesIterator"))
|
||||||
|
method("hasNext", "Whether another line is available.", returns = type("lyng.Bool"))
|
||||||
|
method("next", "Return the next line as `String`.", returns = type("lyng.String"))
|
||||||
|
method("cancelIteration", "Stop the iteration early.")
|
||||||
}
|
}
|
||||||
|
|
||||||
// Top-level exported constants
|
// Top-level exported constants
|
||||||
|
|||||||
@@ -0,0 +1,117 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyngio.docs
|
||||||
|
|
||||||
|
import net.sergeych.lyng.miniast.BuiltinDocRegistry
|
||||||
|
import net.sergeych.lyng.miniast.ParamDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
|
||||||
|
object ProcessBuiltinDocs {
|
||||||
|
private var registered = false
|
||||||
|
|
||||||
|
fun ensure() {
|
||||||
|
if (registered) return
|
||||||
|
BuiltinDocRegistry.module("lyng.io.process") {
|
||||||
|
classDoc(
|
||||||
|
name = "Process",
|
||||||
|
doc = "Process execution and control."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "execute",
|
||||||
|
doc = "Execute a process with arguments.",
|
||||||
|
params = listOf(ParamDoc("executable", type("lyng.String")), ParamDoc("args", type("lyng.List"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "shell",
|
||||||
|
doc = "Execute a command via system shell.",
|
||||||
|
params = listOf(ParamDoc("command", type("lyng.String"))),
|
||||||
|
returns = type("RunningProcess"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "Platform",
|
||||||
|
doc = "Platform information."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "details",
|
||||||
|
doc = "Get platform core details.",
|
||||||
|
returns = type("lyng.Map"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "isSupported",
|
||||||
|
doc = "Check if processes are supported on this platform.",
|
||||||
|
returns = type("lyng.Bool"),
|
||||||
|
isStatic = true
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
classDoc(
|
||||||
|
name = "RunningProcess",
|
||||||
|
doc = "Handle to a running process."
|
||||||
|
) {
|
||||||
|
method(
|
||||||
|
name = "stdout",
|
||||||
|
doc = "Get standard output stream as a Flow of lines.",
|
||||||
|
returns = type("lyng.Flow")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "stderr",
|
||||||
|
doc = "Get standard error stream as a Flow of lines.",
|
||||||
|
returns = type("lyng.Flow")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "signal",
|
||||||
|
doc = "Send a signal to the process (e.g. 'SIGINT', 'SIGTERM', 'SIGKILL').",
|
||||||
|
params = listOf(ParamDoc("signal", type("lyng.String")))
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "waitFor",
|
||||||
|
doc = "Wait for the process to exit and return its exit code.",
|
||||||
|
returns = type("lyng.Int")
|
||||||
|
)
|
||||||
|
method(
|
||||||
|
name = "destroy",
|
||||||
|
doc = "Forcefully terminate the process."
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Top-level exported constants
|
||||||
|
valDoc(
|
||||||
|
name = "Process",
|
||||||
|
doc = "Process execution and control.",
|
||||||
|
type = type("Process")
|
||||||
|
)
|
||||||
|
valDoc(
|
||||||
|
name = "Platform",
|
||||||
|
doc = "Platform information.",
|
||||||
|
type = type("Platform")
|
||||||
|
)
|
||||||
|
valDoc(
|
||||||
|
name = "RunningProcess",
|
||||||
|
doc = "Handle to a running process.",
|
||||||
|
type = type("RunningProcess")
|
||||||
|
)
|
||||||
|
}
|
||||||
|
registered = true
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,7 +21,7 @@ import org.jetbrains.kotlin.gradle.ExperimentalWasmDsl
|
|||||||
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
import org.jetbrains.kotlin.gradle.dsl.JvmTarget
|
||||||
|
|
||||||
group = "net.sergeych"
|
group = "net.sergeych"
|
||||||
version = "1.2.0-SNAPSHOT"
|
version = "1.5.0-SNAPSHOT"
|
||||||
|
|
||||||
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
||||||
|
|
||||||
@@ -46,6 +46,7 @@ buildkonfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
kotlin {
|
kotlin {
|
||||||
|
jvmToolchain(17)
|
||||||
jvm()
|
jvm()
|
||||||
androidTarget {
|
androidTarget {
|
||||||
publishLibraryVariants("release")
|
publishLibraryVariants("release")
|
||||||
@@ -96,6 +97,7 @@ kotlin {
|
|||||||
kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
|
kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
|
||||||
//put your multiplatform dependencies here
|
//put your multiplatform dependencies here
|
||||||
api(libs.kotlinx.coroutines.core)
|
api(libs.kotlinx.coroutines.core)
|
||||||
api(libs.mp.bintools)
|
api(libs.mp.bintools)
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
actual object Benchmarks {
|
||||||
|
actual val enabled: Boolean = run {
|
||||||
|
val p = System.getProperty("LYNG_BENCHMARKS")?.lowercase()
|
||||||
|
val e = System.getenv("BENCHMARKS")?.lowercase()
|
||||||
|
fun parse(v: String?): Boolean =
|
||||||
|
v == "true" || v == "1" || v == "yes"
|
||||||
|
parse(p) || parse(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -23,7 +23,7 @@ actual object PerfDefaults {
|
|||||||
|
|
||||||
actual val ARG_BUILDER: Boolean = true
|
actual val ARG_BUILDER: Boolean = true
|
||||||
actual val SKIP_ARGS_ON_NULL_RECEIVER: Boolean = true
|
actual val SKIP_ARGS_ON_NULL_RECEIVER: Boolean = true
|
||||||
actual val SCOPE_POOL: Boolean = false
|
actual val SCOPE_POOL: Boolean = true
|
||||||
|
|
||||||
actual val FIELD_PIC: Boolean = true
|
actual val FIELD_PIC: Boolean = true
|
||||||
actual val METHOD_PIC: Boolean = true
|
actual val METHOD_PIC: Boolean = true
|
||||||
@@ -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
|
||||||
}
|
}
|
||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -18,7 +18,6 @@
|
|||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
|
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjVoid
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Android actual: per-thread scope frame pool backed by ThreadLocal.
|
* Android actual: per-thread scope frame pool backed by ThreadLocal.
|
||||||
@@ -38,24 +37,31 @@ actual object ScopePool {
|
|||||||
|
|
||||||
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
actual fun borrow(parent: Scope, args: Arguments, pos: Pos, thisObj: Obj): Scope {
|
||||||
val pool = pool()
|
val pool = pool()
|
||||||
val s = if (pool.isNotEmpty()) pool.removeLast() else Scope(parent, args, pos, thisObj)
|
if (pool.isNotEmpty()) {
|
||||||
return try {
|
val s = pool.removeLast()
|
||||||
if (s.parent !== parent || s.args !== args || s.pos !== pos || s.thisObj !== thisObj) {
|
try {
|
||||||
|
// Re-initialize pooled instance
|
||||||
s.resetForReuse(parent, args, pos, thisObj)
|
s.resetForReuse(parent, args, pos, thisObj)
|
||||||
} else {
|
return s
|
||||||
s.frameId = nextFrameId()
|
} catch (e: IllegalStateException) {
|
||||||
|
// Defensive fallback: if a cycle in scope parent chain is detected during reuse,
|
||||||
|
// discard pooled instance for this call frame and allocate a fresh scope instead.
|
||||||
|
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
||||||
|
return Scope(parent, args, pos, thisObj)
|
||||||
|
} else {
|
||||||
|
throw e
|
||||||
|
}
|
||||||
}
|
}
|
||||||
s
|
|
||||||
} catch (e: IllegalStateException) {
|
|
||||||
if (e.message?.contains("cycle") == true && e.message?.contains("scope parent chain") == true) {
|
|
||||||
Scope(parent, args, pos, thisObj)
|
|
||||||
} else throw e
|
|
||||||
}
|
}
|
||||||
|
return Scope(parent, args, pos, thisObj)
|
||||||
}
|
}
|
||||||
|
|
||||||
actual fun release(scope: Scope) {
|
actual fun release(scope: Scope) {
|
||||||
val pool = pool()
|
val pool = pool()
|
||||||
scope.resetForReuse(parent = null, args = Arguments.EMPTY, pos = Pos.builtIn, thisObj = ObjVoid)
|
if (pool.size < MAX_POOL_SIZE) {
|
||||||
if (pool.size < MAX_POOL_SIZE) pool.addLast(scope)
|
// Scrub sensitive references to avoid accidental retention before returning to pool
|
||||||
|
scope.scrub()
|
||||||
|
pool.addLast(scope)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -20,6 +20,7 @@ package net.sergeych.lyng
|
|||||||
import net.sergeych.lyng.miniast.MiniTypeRef
|
import net.sergeych.lyng.miniast.MiniTypeRef
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjList
|
import net.sergeych.lyng.obj.ObjList
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
import net.sergeych.lyng.obj.ObjRecord
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@@ -51,12 +52,69 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
defaultVisibility: Visibility = Visibility.Public,
|
defaultVisibility: Visibility = Visibility.Public,
|
||||||
declaringClass: net.sergeych.lyng.obj.ObjClass? = scope.currentClassCtx
|
declaringClass: net.sergeych.lyng.obj.ObjClass? = scope.currentClassCtx
|
||||||
) {
|
) {
|
||||||
|
// Fast path for simple positional-only calls with no ellipsis and no defaults
|
||||||
|
if (arguments.named.isEmpty() && !arguments.tailBlockMode) {
|
||||||
|
var hasComplex = false
|
||||||
|
for (p in params) {
|
||||||
|
if (p.isEllipsis || p.defaultValue != null) {
|
||||||
|
hasComplex = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!hasComplex) {
|
||||||
|
if (arguments.list.size > params.size)
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
if (arguments.list.size < params.size) {
|
||||||
|
for (i in arguments.list.size until params.size) {
|
||||||
|
val a = params[i]
|
||||||
|
if (!a.type.isNullable) {
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i in params.indices) {
|
||||||
|
val a = params[i]
|
||||||
|
val value = if (i < arguments.list.size) arguments.list[i] else ObjNull
|
||||||
|
val recordType = if (declaringClass != null && a.accessType != null) {
|
||||||
|
ObjRecord.Type.ConstructorField
|
||||||
|
} else {
|
||||||
|
ObjRecord.Type.Argument
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
a.name,
|
||||||
|
(a.accessType ?: defaultAccessType).isMutable,
|
||||||
|
value.byValueCopy(),
|
||||||
|
a.visibility ?: defaultVisibility,
|
||||||
|
recordType = recordType,
|
||||||
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient
|
||||||
|
)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun assign(a: Item, value: Obj) {
|
fun assign(a: Item, value: Obj) {
|
||||||
scope.addItem(a.name, (a.accessType ?: defaultAccessType).isMutable,
|
val recordType = if (declaringClass != null && a.accessType != null) {
|
||||||
|
ObjRecord.Type.ConstructorField
|
||||||
|
} else {
|
||||||
|
ObjRecord.Type.Argument
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
a.name,
|
||||||
|
(a.accessType ?: defaultAccessType).isMutable,
|
||||||
value.byValueCopy(),
|
value.byValueCopy(),
|
||||||
a.visibility ?: defaultVisibility,
|
a.visibility ?: defaultVisibility,
|
||||||
recordType = ObjRecord.Type.Argument,
|
recordType = recordType,
|
||||||
declaringClass = declaringClass)
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun missingValue(a: Item, error: String): Obj {
|
||||||
|
return a.defaultValue?.callOn(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
|
||||||
@@ -137,8 +195,7 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
assign(a, namedValues[i]!!)
|
assign(a, namedValues[i]!!)
|
||||||
} else {
|
} else {
|
||||||
val value = if (hp < callArgs.size) callArgs[hp++]
|
val value = if (hp < callArgs.size) callArgs[hp++]
|
||||||
else a.defaultValue?.execute(scope)
|
else missingValue(a, "too few arguments for the call (missing ${a.name})")
|
||||||
?: scope.raiseIllegalArgument("too few arguments for the call (missing ${a.name})")
|
|
||||||
assign(a, value)
|
assign(a, value)
|
||||||
}
|
}
|
||||||
i++
|
i++
|
||||||
@@ -158,8 +215,7 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
assign(a, namedValues[i]!!)
|
assign(a, namedValues[i]!!)
|
||||||
} else {
|
} else {
|
||||||
val value = if (tp >= headPosBound) callArgs[tp--]
|
val value = if (tp >= headPosBound) callArgs[tp--]
|
||||||
else a.defaultValue?.execute(scope)
|
else missingValue(a, "too few arguments for the call")
|
||||||
?: scope.raiseIllegalArgument("too few arguments for the call")
|
|
||||||
assign(a, value)
|
assign(a, value)
|
||||||
}
|
}
|
||||||
i--
|
i--
|
||||||
@@ -194,10 +250,194 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Assign arguments directly into frame slots using [paramSlotPlan] without creating scope locals.
|
||||||
|
* Default expressions must resolve through frame slots (no scope mirroring).
|
||||||
|
*/
|
||||||
|
suspend fun assignToFrame(
|
||||||
|
scope: Scope,
|
||||||
|
arguments: Arguments = scope.args,
|
||||||
|
paramSlotPlan: Map<String, Int>,
|
||||||
|
frame: FrameAccess,
|
||||||
|
slotOffset: Int = 0
|
||||||
|
) {
|
||||||
|
fun slotFor(name: String): Int {
|
||||||
|
val full = paramSlotPlan[name] ?: scope.raiseIllegalState("parameter slot for '$name' is missing")
|
||||||
|
val slot = full - slotOffset
|
||||||
|
if (slot < 0) scope.raiseIllegalState("parameter slot for '$name' is out of range")
|
||||||
|
return slot
|
||||||
|
}
|
||||||
|
|
||||||
|
fun setFrameValue(slot: Int, value: Obj) {
|
||||||
|
when (value) {
|
||||||
|
is net.sergeych.lyng.obj.ObjInt -> frame.setInt(slot, value.value)
|
||||||
|
is net.sergeych.lyng.obj.ObjReal -> frame.setReal(slot, value.value)
|
||||||
|
is net.sergeych.lyng.obj.ObjBool -> frame.setBool(slot, value.value)
|
||||||
|
else -> frame.setObj(slot, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fun assign(a: Item, value: Obj) {
|
||||||
|
val slot = slotFor(a.name)
|
||||||
|
setFrameValue(slot, value.byValueCopy())
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun missingValue(a: Item, error: String): Obj {
|
||||||
|
return a.defaultValue?.callOn(scope)
|
||||||
|
?: if (a.type.isNullable) ObjNull else scope.raiseIllegalArgument(error)
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fast path for simple positional-only calls with no ellipsis and no defaults
|
||||||
|
if (arguments.named.isEmpty() && !arguments.tailBlockMode) {
|
||||||
|
var hasComplex = false
|
||||||
|
for (p in params) {
|
||||||
|
if (p.isEllipsis || p.defaultValue != null) {
|
||||||
|
hasComplex = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (!hasComplex) {
|
||||||
|
if (arguments.list.size > params.size)
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
if (arguments.list.size < params.size) {
|
||||||
|
for (i in arguments.list.size until params.size) {
|
||||||
|
val a = params[i]
|
||||||
|
if (!a.type.isNullable) {
|
||||||
|
scope.raiseIllegalArgument("expected ${params.size} arguments, got ${arguments.list.size}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
for (i in params.indices) {
|
||||||
|
val a = params[i]
|
||||||
|
val value = if (i < arguments.list.size) arguments.list[i] else ObjNull
|
||||||
|
assign(a, value)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Prepare positional args and parameter count, handle tail-block binding
|
||||||
|
val callArgs: List<Obj>
|
||||||
|
val paramsSize: Int
|
||||||
|
if (arguments.tailBlockMode) {
|
||||||
|
val lastParam = params.last()
|
||||||
|
if (arguments.named.containsKey(lastParam.name))
|
||||||
|
scope.raiseIllegalArgument("trailing block cannot be used when the last parameter is already assigned by a named argument")
|
||||||
|
paramsSize = params.size - 1
|
||||||
|
assign(lastParam, arguments.list.last())
|
||||||
|
callArgs = arguments.list.dropLast(1)
|
||||||
|
} else {
|
||||||
|
paramsSize = params.size
|
||||||
|
callArgs = arguments.list
|
||||||
|
}
|
||||||
|
|
||||||
|
val coveredByPositional = BooleanArray(paramsSize)
|
||||||
|
run {
|
||||||
|
var headRequired = 0
|
||||||
|
var tailRequired = 0
|
||||||
|
val ellipsisIdx = params.subList(0, paramsSize).indexOfFirst { it.isEllipsis }
|
||||||
|
if (ellipsisIdx >= 0) {
|
||||||
|
for (i in 0 until ellipsisIdx) if (!params[i].isEllipsis && params[i].defaultValue == null) headRequired++
|
||||||
|
for (i in paramsSize - 1 downTo ellipsisIdx + 1) if (params[i].defaultValue == null) tailRequired++
|
||||||
|
} else {
|
||||||
|
for (i in 0 until paramsSize) if (params[i].defaultValue == null) headRequired++
|
||||||
|
}
|
||||||
|
val P = callArgs.size
|
||||||
|
if (ellipsisIdx < 0) {
|
||||||
|
val k = minOf(P, paramsSize)
|
||||||
|
for (i in 0 until k) coveredByPositional[i] = true
|
||||||
|
} else {
|
||||||
|
val headTake = minOf(P, headRequired)
|
||||||
|
for (i in 0 until headTake) coveredByPositional[i] = true
|
||||||
|
val remaining = P - headTake
|
||||||
|
val tailTake = minOf(remaining, tailRequired)
|
||||||
|
var j = paramsSize - 1
|
||||||
|
var taken = 0
|
||||||
|
while (j > ellipsisIdx && taken < tailTake) {
|
||||||
|
coveredByPositional[j] = true
|
||||||
|
j--
|
||||||
|
taken++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val assignedByName = BooleanArray(paramsSize)
|
||||||
|
val namedValues = arrayOfNulls<Obj>(paramsSize)
|
||||||
|
if (arguments.named.isNotEmpty()) {
|
||||||
|
for ((k, v) in arguments.named) {
|
||||||
|
val idx = params.subList(0, paramsSize).indexOfFirst { it.name == k }
|
||||||
|
if (idx < 0) scope.raiseIllegalArgument("unknown parameter '$k'")
|
||||||
|
if (params[idx].isEllipsis) scope.raiseIllegalArgument("ellipsis (variadic) parameter cannot be assigned by name: '$k'")
|
||||||
|
if (coveredByPositional[idx]) scope.raiseIllegalArgument("argument '$k' is already set by positional argument")
|
||||||
|
if (assignedByName[idx]) scope.raiseIllegalArgument("argument '$k' is already set")
|
||||||
|
assignedByName[idx] = true
|
||||||
|
namedValues[idx] = v
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun processHead(index: Int, headPos: Int): Pair<Int, Int> {
|
||||||
|
var i = index
|
||||||
|
var hp = headPos
|
||||||
|
while (i < paramsSize) {
|
||||||
|
val a = params[i]
|
||||||
|
if (a.isEllipsis) break
|
||||||
|
if (assignedByName[i]) {
|
||||||
|
assign(a, namedValues[i]!!)
|
||||||
|
} else {
|
||||||
|
val value = if (hp < callArgs.size) callArgs[hp++]
|
||||||
|
else missingValue(a, "too few arguments for the call (missing ${a.name})")
|
||||||
|
assign(a, value)
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
return i to hp
|
||||||
|
}
|
||||||
|
|
||||||
|
suspend fun processTail(startExclusive: Int, tailStart: Int, headPosBound: Int): Int {
|
||||||
|
var i = paramsSize - 1
|
||||||
|
var tp = tailStart
|
||||||
|
while (i > startExclusive) {
|
||||||
|
val a = params[i]
|
||||||
|
if (a.isEllipsis) break
|
||||||
|
if (i < assignedByName.size && assignedByName[i]) {
|
||||||
|
assign(a, namedValues[i]!!)
|
||||||
|
} else {
|
||||||
|
val value = if (tp >= headPosBound) callArgs[tp--]
|
||||||
|
else missingValue(a, "too few arguments for the call")
|
||||||
|
assign(a, value)
|
||||||
|
}
|
||||||
|
i--
|
||||||
|
}
|
||||||
|
return tp
|
||||||
|
}
|
||||||
|
|
||||||
|
fun processEllipsis(index: Int, headPos: Int, tailPos: Int) {
|
||||||
|
val a = params[index]
|
||||||
|
val from = headPos
|
||||||
|
val to = tailPos
|
||||||
|
val l = if (from > to) ObjList()
|
||||||
|
else ObjList(callArgs.subList(from, to + 1).toMutableList())
|
||||||
|
assign(a, l)
|
||||||
|
}
|
||||||
|
|
||||||
|
val ellipsisIndex = params.subList(0, paramsSize).indexOfFirst { it.isEllipsis }
|
||||||
|
|
||||||
|
if (ellipsisIndex >= 0) {
|
||||||
|
val (_, headConsumedTo) = processHead(0, 0)
|
||||||
|
val tailConsumedFrom = processTail(ellipsisIndex, callArgs.size - 1, headConsumedTo)
|
||||||
|
processEllipsis(ellipsisIndex, headConsumedTo, tailConsumedFrom)
|
||||||
|
} else {
|
||||||
|
val (_, headConsumedTo) = processHead(0, 0)
|
||||||
|
if (headConsumedTo != callArgs.size)
|
||||||
|
scope.raiseIllegalArgument("too many arguments for the call")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Single argument declaration descriptor.
|
* Single argument declaration descriptor.
|
||||||
*
|
*
|
||||||
* @param defaultValue default value, if set, can't be an [Obj] as it can depend on the call site, call args, etc.
|
* @param defaultValue default value, callable evaluated at call site.
|
||||||
* If not null, could be executed on __caller context__ only.
|
* If not null, could be executed on __caller context__ only.
|
||||||
*/
|
*/
|
||||||
data class Item(
|
data class Item(
|
||||||
@@ -210,8 +450,9 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
* Default value, if set, can't be an [Obj] as it can depend on the call site, call args, etc.
|
* Default value, if set, can't be an [Obj] as it can depend on the call site, call args, etc.
|
||||||
* So it is a [Statement] that must be executed on __caller context__.
|
* So it is a [Statement] that must be executed on __caller context__.
|
||||||
*/
|
*/
|
||||||
val defaultValue: Statement? = null,
|
val defaultValue: Obj? = null,
|
||||||
val accessType: AccessType? = null,
|
val accessType: AccessType? = null,
|
||||||
val visibility: Visibility? = null,
|
val visibility: Visibility? = null,
|
||||||
|
val isTransient: Boolean = false,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -20,7 +20,7 @@ package net.sergeych.lyng
|
|||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
|
|
||||||
data class ParsedArgument(
|
data class ParsedArgument(
|
||||||
val value: Statement,
|
val value: Obj,
|
||||||
val pos: Pos,
|
val pos: Pos,
|
||||||
val isSplat: Boolean = false,
|
val isSplat: Boolean = false,
|
||||||
val name: String? = null,
|
val name: String? = null,
|
||||||
@@ -37,128 +37,128 @@ data class ParsedArgument(
|
|||||||
count++
|
count++
|
||||||
if (count > limit) break
|
if (count > limit) break
|
||||||
}
|
}
|
||||||
if (!hasSplatOrNamed && count == this.size) {
|
if (!hasSplatOrNamed && count == this.size) {
|
||||||
val quick = when (count) {
|
val quick = when (count) {
|
||||||
0 -> Arguments.EMPTY
|
0 -> Arguments.EMPTY
|
||||||
1 -> Arguments(listOf(this.elementAt(0).value.execute(scope)), tailBlockMode)
|
1 -> Arguments(listOf(this.elementAt(0).value.callOn(scope)), tailBlockMode)
|
||||||
2 -> {
|
2 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1), tailBlockMode)
|
Arguments(listOf(a0, a1), tailBlockMode)
|
||||||
}
|
}
|
||||||
3 -> {
|
3 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2), tailBlockMode)
|
Arguments(listOf(a0, a1, a2), tailBlockMode)
|
||||||
}
|
}
|
||||||
4 -> {
|
4 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3), tailBlockMode)
|
||||||
}
|
}
|
||||||
5 -> {
|
5 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4), tailBlockMode)
|
||||||
}
|
}
|
||||||
6 -> {
|
6 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5), tailBlockMode)
|
||||||
}
|
}
|
||||||
7 -> {
|
7 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
val a6 = this.elementAt(6).value.execute(scope)
|
val a6 = this.elementAt(6).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6), tailBlockMode)
|
||||||
}
|
}
|
||||||
8 -> {
|
8 -> {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
val a6 = this.elementAt(6).value.execute(scope)
|
val a6 = this.elementAt(6).value.callOn(scope)
|
||||||
val a7 = this.elementAt(7).value.execute(scope)
|
val a7 = this.elementAt(7).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7), tailBlockMode)
|
||||||
}
|
}
|
||||||
9 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
9 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
val a6 = this.elementAt(6).value.execute(scope)
|
val a6 = this.elementAt(6).value.callOn(scope)
|
||||||
val a7 = this.elementAt(7).value.execute(scope)
|
val a7 = this.elementAt(7).value.callOn(scope)
|
||||||
val a8 = this.elementAt(8).value.execute(scope)
|
val a8 = this.elementAt(8).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8), tailBlockMode)
|
||||||
} else null
|
} else null
|
||||||
10 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
10 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
val a6 = this.elementAt(6).value.execute(scope)
|
val a6 = this.elementAt(6).value.callOn(scope)
|
||||||
val a7 = this.elementAt(7).value.execute(scope)
|
val a7 = this.elementAt(7).value.callOn(scope)
|
||||||
val a8 = this.elementAt(8).value.execute(scope)
|
val a8 = this.elementAt(8).value.callOn(scope)
|
||||||
val a9 = this.elementAt(9).value.execute(scope)
|
val a9 = this.elementAt(9).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9), tailBlockMode)
|
||||||
} else null
|
} else null
|
||||||
11 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
11 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
val a6 = this.elementAt(6).value.execute(scope)
|
val a6 = this.elementAt(6).value.callOn(scope)
|
||||||
val a7 = this.elementAt(7).value.execute(scope)
|
val a7 = this.elementAt(7).value.callOn(scope)
|
||||||
val a8 = this.elementAt(8).value.execute(scope)
|
val a8 = this.elementAt(8).value.callOn(scope)
|
||||||
val a9 = this.elementAt(9).value.execute(scope)
|
val a9 = this.elementAt(9).value.callOn(scope)
|
||||||
val a10 = this.elementAt(10).value.execute(scope)
|
val a10 = this.elementAt(10).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10), tailBlockMode)
|
||||||
} else null
|
} else null
|
||||||
12 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
12 -> if (PerfFlags.ARG_SMALL_ARITY_12) {
|
||||||
val a0 = this.elementAt(0).value.execute(scope)
|
val a0 = this.elementAt(0).value.callOn(scope)
|
||||||
val a1 = this.elementAt(1).value.execute(scope)
|
val a1 = this.elementAt(1).value.callOn(scope)
|
||||||
val a2 = this.elementAt(2).value.execute(scope)
|
val a2 = this.elementAt(2).value.callOn(scope)
|
||||||
val a3 = this.elementAt(3).value.execute(scope)
|
val a3 = this.elementAt(3).value.callOn(scope)
|
||||||
val a4 = this.elementAt(4).value.execute(scope)
|
val a4 = this.elementAt(4).value.callOn(scope)
|
||||||
val a5 = this.elementAt(5).value.execute(scope)
|
val a5 = this.elementAt(5).value.callOn(scope)
|
||||||
val a6 = this.elementAt(6).value.execute(scope)
|
val a6 = this.elementAt(6).value.callOn(scope)
|
||||||
val a7 = this.elementAt(7).value.execute(scope)
|
val a7 = this.elementAt(7).value.callOn(scope)
|
||||||
val a8 = this.elementAt(8).value.execute(scope)
|
val a8 = this.elementAt(8).value.callOn(scope)
|
||||||
val a9 = this.elementAt(9).value.execute(scope)
|
val a9 = this.elementAt(9).value.callOn(scope)
|
||||||
val a10 = this.elementAt(10).value.execute(scope)
|
val a10 = this.elementAt(10).value.callOn(scope)
|
||||||
val a11 = this.elementAt(11).value.execute(scope)
|
val a11 = this.elementAt(11).value.callOn(scope)
|
||||||
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), tailBlockMode)
|
Arguments(listOf(a0, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, a11), tailBlockMode)
|
||||||
} else null
|
} else null
|
||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
if (quick != null) return quick
|
if (quick != null) return quick
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// General path: build positional list and named map, enforcing ordering rules
|
// General path: build positional list and named map, enforcing ordering rules
|
||||||
val positional: MutableList<Obj> = mutableListOf()
|
val positional: MutableList<Obj> = mutableListOf()
|
||||||
var named: MutableMap<String, Obj>? = null
|
var named: MutableMap<String, Obj>? = null
|
||||||
var namedSeen = false
|
var namedSeen = false
|
||||||
for ((idx, x) in this.withIndex()) {
|
for ((idx, x) in this.withIndex()) {
|
||||||
@@ -166,12 +166,12 @@ data class ParsedArgument(
|
|||||||
// Named argument
|
// Named argument
|
||||||
if (named == null) named = linkedMapOf()
|
if (named == null) named = linkedMapOf()
|
||||||
if (named.containsKey(x.name)) scope.raiseIllegalArgument("argument '${x.name}' is already set")
|
if (named.containsKey(x.name)) scope.raiseIllegalArgument("argument '${x.name}' is already set")
|
||||||
val v = x.value.execute(scope)
|
val v = x.value.callOn(scope)
|
||||||
named[x.name] = v
|
named[x.name] = v
|
||||||
namedSeen = true
|
namedSeen = true
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
val value = x.value.execute(scope)
|
val value = x.value.callOn(scope)
|
||||||
if (x.isSplat) {
|
if (x.isSplat) {
|
||||||
when {
|
when {
|
||||||
// IMPORTANT: handle ObjMap BEFORE generic Iterable to ensure map splats
|
// IMPORTANT: handle ObjMap BEFORE generic Iterable to ensure map splats
|
||||||
@@ -254,4 +254,3 @@ data class ParsedArgument(
|
|||||||
fun from(values: Collection<Obj>) = Arguments(values.toList())
|
fun from(values: Collection<Obj>) = Arguments(values.toList())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
expect object Benchmarks {
|
||||||
|
val enabled: Boolean
|
||||||
|
}
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
/*
|
||||||
|
* 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 {
|
||||||
|
return bytecodeOnly(scope, "block statement")
|
||||||
|
}
|
||||||
|
|
||||||
|
fun statements(): List<Statement> = block.debugStatements()
|
||||||
|
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.bytecode.BytecodeStatement
|
||||||
|
|
||||||
|
interface BytecodeBodyProvider {
|
||||||
|
fun bytecodeBody(): BytecodeStatement?
|
||||||
|
}
|
||||||
@@ -0,0 +1,19 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
interface BytecodeCallable
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.bytecode.BytecodeStatement
|
||||||
|
import net.sergeych.lyng.bytecode.CmdVm
|
||||||
|
import net.sergeych.lyng.bytecode.seedFrameLocalsFromScope
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
|
||||||
|
internal suspend fun executeBytecodeWithSeed(scope: Scope, stmt: Statement, label: String): Obj {
|
||||||
|
val bytecode = when (stmt) {
|
||||||
|
is BytecodeStatement -> stmt
|
||||||
|
is BytecodeBodyProvider -> stmt.bytecodeBody()
|
||||||
|
else -> null
|
||||||
|
} ?: scope.raiseIllegalState("$label requires bytecode statement")
|
||||||
|
scope.pos = bytecode.pos
|
||||||
|
return CmdVm().execute(bytecode.bytecodeFunction(), scope, scope.args) { frame, _ ->
|
||||||
|
seedFrameLocalsFromScope(frame, scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Compile-time call metadata for known functions. Used to select lambda receiver semantics.
|
||||||
|
*/
|
||||||
|
data class CallSignature(
|
||||||
|
val tailBlockReceiverType: String? = null
|
||||||
|
)
|
||||||
@@ -0,0 +1,24 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
data class CaptureSlot(
|
||||||
|
val name: String,
|
||||||
|
val ownerScopeId: Int? = null,
|
||||||
|
val ownerSlot: Int? = null,
|
||||||
|
)
|
||||||
@@ -0,0 +1,202 @@
|
|||||||
|
/*
|
||||||
|
* 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.*
|
||||||
|
|
||||||
|
data class ClassDeclBaseSpec(
|
||||||
|
val name: String,
|
||||||
|
val args: List<ParsedArgument>?
|
||||||
|
)
|
||||||
|
|
||||||
|
data class ClassDeclSpec(
|
||||||
|
val declaredName: String?,
|
||||||
|
val className: String,
|
||||||
|
val typeName: String,
|
||||||
|
val startPos: Pos,
|
||||||
|
val isExtern: Boolean,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isObject: Boolean,
|
||||||
|
val isAnonymous: Boolean,
|
||||||
|
val baseSpecs: List<ClassDeclBaseSpec>,
|
||||||
|
val constructorArgs: ArgsDeclaration?,
|
||||||
|
val constructorFieldIds: Map<String, Int>?,
|
||||||
|
val bodyInit: Statement?,
|
||||||
|
val initScope: List<Statement>,
|
||||||
|
)
|
||||||
|
|
||||||
|
internal suspend fun executeClassDecl(
|
||||||
|
scope: Scope,
|
||||||
|
spec: ClassDeclSpec,
|
||||||
|
bodyCaptureRecords: List<ObjRecord>? = null,
|
||||||
|
bodyCaptureNames: List<String>? = null
|
||||||
|
): Obj {
|
||||||
|
fun checkClosedParents(parents: List<ObjClass>, pos: Pos) {
|
||||||
|
val closedParent = parents.firstOrNull { it.isClosed } ?: return
|
||||||
|
throw ScriptError(pos, "can't inherit from closed class ${closedParent.className}")
|
||||||
|
}
|
||||||
|
if (spec.isObject) {
|
||||||
|
val parentClasses = spec.baseSpecs.map { baseSpec ->
|
||||||
|
val rec = scope[baseSpec.name] ?: throw ScriptError(spec.startPos, "unknown base class: ${baseSpec.name}")
|
||||||
|
(rec.value as? ObjClass) ?: throw ScriptError(spec.startPos, "${baseSpec.name} is not a class")
|
||||||
|
}
|
||||||
|
checkClosedParents(parentClasses, spec.startPos)
|
||||||
|
|
||||||
|
val newClass = ObjInstanceClass(spec.className, *parentClasses.toTypedArray())
|
||||||
|
newClass.isAnonymous = spec.isAnonymous
|
||||||
|
newClass.constructorMeta = ArgsDeclaration(emptyList(), Token.Type.RPAREN)
|
||||||
|
for (i in parentClasses.indices) {
|
||||||
|
val argsList = spec.baseSpecs[i].args
|
||||||
|
if (argsList != null) newClass.directParentArgs[parentClasses[i]] = argsList
|
||||||
|
}
|
||||||
|
|
||||||
|
val classScope = scope.createChildScope(newThisObj = newClass)
|
||||||
|
if (!bodyCaptureRecords.isNullOrEmpty() && !bodyCaptureNames.isNullOrEmpty()) {
|
||||||
|
classScope.captureRecords = bodyCaptureRecords
|
||||||
|
classScope.captureNames = bodyCaptureNames
|
||||||
|
}
|
||||||
|
classScope.currentClassCtx = newClass
|
||||||
|
newClass.classScope = classScope
|
||||||
|
classScope.addConst("object", newClass)
|
||||||
|
|
||||||
|
spec.bodyInit?.let { executeBytecodeWithSeed(classScope, it, "object body init") }
|
||||||
|
|
||||||
|
val instance = newClass.callOn(scope.createChildScope(Arguments.EMPTY))
|
||||||
|
if (spec.declaredName != null) {
|
||||||
|
scope.addItem(spec.declaredName, false, instance)
|
||||||
|
}
|
||||||
|
return instance
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.isExtern) {
|
||||||
|
val rec = scope[spec.className]
|
||||||
|
val existing = rec?.value as? ObjClass
|
||||||
|
val resolved = if (existing != null) {
|
||||||
|
existing
|
||||||
|
} else if (spec.className.contains('.')) {
|
||||||
|
scope.resolveQualifiedIdentifier(spec.className) as? ObjClass
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
val stub = resolved ?: ObjInstanceClass(spec.className).apply { this.isAbstract = true }
|
||||||
|
spec.declaredName?.let { scope.addItem(it, false, stub) }
|
||||||
|
return stub
|
||||||
|
}
|
||||||
|
|
||||||
|
val parentClasses = spec.baseSpecs.map { baseSpec ->
|
||||||
|
val rec = scope[baseSpec.name]
|
||||||
|
val cls = rec?.value as? ObjClass
|
||||||
|
if (cls != null) return@map cls
|
||||||
|
if (baseSpec.name == "Exception") return@map ObjException.Root
|
||||||
|
if (rec == null) throw ScriptError(spec.startPos, "unknown base class: ${baseSpec.name}")
|
||||||
|
throw ScriptError(spec.startPos, "${baseSpec.name} is not a class")
|
||||||
|
}
|
||||||
|
checkClosedParents(parentClasses, spec.startPos)
|
||||||
|
|
||||||
|
val constructorCode = object : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val instance = scope.thisObj as ObjInstance
|
||||||
|
return instance
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val newClass = ObjInstanceClass(spec.className, *parentClasses.toTypedArray()).also {
|
||||||
|
it.isAbstract = spec.isAbstract
|
||||||
|
it.isClosed = spec.isClosed
|
||||||
|
it.instanceConstructor = constructorCode
|
||||||
|
it.constructorMeta = spec.constructorArgs
|
||||||
|
for (i in parentClasses.indices) {
|
||||||
|
val argsList = spec.baseSpecs[i].args
|
||||||
|
if (argsList != null) it.directParentArgs[parentClasses[i]] = argsList
|
||||||
|
}
|
||||||
|
spec.constructorArgs?.params?.forEach { p ->
|
||||||
|
if (p.accessType != null) {
|
||||||
|
it.createField(
|
||||||
|
p.name,
|
||||||
|
ObjNull,
|
||||||
|
isMutable = p.accessType == AccessType.Var,
|
||||||
|
visibility = p.visibility ?: Visibility.Public,
|
||||||
|
declaringClass = it,
|
||||||
|
pos = Pos.builtIn,
|
||||||
|
isTransient = p.isTransient,
|
||||||
|
type = ObjRecord.Type.ConstructorField,
|
||||||
|
fieldId = spec.constructorFieldIds?.get(p.name)
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
spec.declaredName?.let { name ->
|
||||||
|
scope.addItem(name, false, newClass)
|
||||||
|
val module = scope as? ModuleScope
|
||||||
|
val frame = module?.moduleFrame
|
||||||
|
if (module != null && frame != null) {
|
||||||
|
val idx = module.moduleFrameLocalSlotNames.indexOf(name)
|
||||||
|
if (idx >= 0) {
|
||||||
|
frame.setObj(idx, newClass)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val classScope = scope.createChildScope(newThisObj = newClass)
|
||||||
|
if (!bodyCaptureRecords.isNullOrEmpty() && !bodyCaptureNames.isNullOrEmpty()) {
|
||||||
|
classScope.captureRecords = bodyCaptureRecords
|
||||||
|
classScope.captureNames = bodyCaptureNames
|
||||||
|
}
|
||||||
|
classScope.currentClassCtx = newClass
|
||||||
|
newClass.classScope = classScope
|
||||||
|
spec.bodyInit?.let { executeBytecodeWithSeed(classScope, it, "class body init") }
|
||||||
|
if (spec.initScope.isNotEmpty()) {
|
||||||
|
for (s in spec.initScope) {
|
||||||
|
executeBytecodeWithSeed(classScope, s, "class init")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
newClass.checkAbstractSatisfaction(spec.startPos)
|
||||||
|
return newClass
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun requireBytecodeBody(
|
||||||
|
scope: Scope,
|
||||||
|
stmt: Statement,
|
||||||
|
label: String
|
||||||
|
): net.sergeych.lyng.bytecode.BytecodeStatement {
|
||||||
|
val bytecode = when (stmt) {
|
||||||
|
is net.sergeych.lyng.bytecode.BytecodeStatement -> stmt
|
||||||
|
is BytecodeBodyProvider -> stmt.bytecodeBody()
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
return bytecode ?: scope.raiseIllegalState("$label requires bytecode statement")
|
||||||
|
}
|
||||||
|
|
||||||
|
class ClassDeclStatement(
|
||||||
|
val spec: ClassDeclSpec,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
val declaredName: String? get() = spec.declaredName
|
||||||
|
val typeName: String get() = spec.typeName
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return executeClassDecl(scope, spec)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val target = scope.parent ?: scope
|
||||||
|
return executeClassDecl(target, spec)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,84 @@
|
|||||||
|
/*
|
||||||
|
* 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.ObjProperty
|
||||||
|
|
||||||
|
class ClassInstanceInitDeclStatement(
|
||||||
|
val initStatement: Statement,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return bytecodeOnly(scope, "class instance init declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ClassInstanceFieldDeclStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val fieldId: Int?,
|
||||||
|
val initStatement: Statement?,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return bytecodeOnly(scope, "class instance field declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ClassInstancePropertyDeclStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val prop: ObjProperty,
|
||||||
|
val methodId: Int?,
|
||||||
|
val initStatement: Statement?,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return bytecodeOnly(scope, "class instance property declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class ClassInstanceDelegatedDeclStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val methodId: Int?,
|
||||||
|
val initStatement: Statement?,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return bytecodeOnly(scope, "class instance delegated declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,111 @@
|
|||||||
|
/*
|
||||||
|
* 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.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
import net.sergeych.lyng.obj.ObjUnset
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class ClassStaticFieldInitStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val initializer: Statement?,
|
||||||
|
val isDelegated: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val initValue = initializer?.let { execBytecodeOnly(scope, it, "class static field init") }?.byValueCopy()
|
||||||
|
?: ObjNull
|
||||||
|
val cls = scope.thisObj as? ObjClass
|
||||||
|
?: scope.raiseIllegalState("static field init requires class scope")
|
||||||
|
return if (isDelegated) {
|
||||||
|
val accessTypeStr = if (isMutable) "Var" else "Val"
|
||||||
|
val accessType = ObjString(accessTypeStr)
|
||||||
|
val finalDelegate = try {
|
||||||
|
initValue.invokeInstanceMethod(
|
||||||
|
scope,
|
||||||
|
"bind",
|
||||||
|
Arguments(ObjString(name), accessType, scope.thisObj)
|
||||||
|
)
|
||||||
|
} catch (_: Exception) {
|
||||||
|
initValue
|
||||||
|
}
|
||||||
|
cls.createClassField(
|
||||||
|
name,
|
||||||
|
ObjUnset,
|
||||||
|
isMutable,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
startPos,
|
||||||
|
isTransient = isTransient,
|
||||||
|
type = ObjRecord.Type.Delegated
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
name,
|
||||||
|
isMutable,
|
||||||
|
ObjUnset,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isTransient = isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
finalDelegate
|
||||||
|
} else {
|
||||||
|
cls.createClassField(
|
||||||
|
name,
|
||||||
|
initValue,
|
||||||
|
isMutable,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
startPos,
|
||||||
|
isTransient = isTransient
|
||||||
|
)
|
||||||
|
scope.addItem(
|
||||||
|
name,
|
||||||
|
isMutable,
|
||||||
|
initValue,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Field,
|
||||||
|
isTransient = isTransient
|
||||||
|
)
|
||||||
|
initValue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun execBytecodeOnly(scope: Scope, stmt: Statement, label: String): Obj {
|
||||||
|
val bytecode = when (stmt) {
|
||||||
|
is net.sergeych.lyng.bytecode.BytecodeStatement -> stmt
|
||||||
|
is BytecodeBodyProvider -> stmt.bytecodeBody()
|
||||||
|
else -> null
|
||||||
|
} ?: scope.raiseIllegalState("$label requires bytecode statement")
|
||||||
|
return bytecode.execute(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -18,67 +18,43 @@
|
|||||||
package net.sergeych.lyng
|
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.ObjRecord
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Scope that adds a "closure" to caller; most often it is used to apply class instance to caller scope.
|
* Bytecode-oriented closure scope that keeps the call scope parent chain for stack traces
|
||||||
* Inherits [Scope.args] and [Scope.thisObj] from [callScope] and adds lookup for symbols
|
* while carrying the lexical closure for `this` variants and module resolution.
|
||||||
* from [closureScope] with proper precedence
|
* Unlike legacy closure scopes, it does not override name lookup.
|
||||||
*/
|
*/
|
||||||
class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
class BytecodeClosureScope(
|
||||||
// Important: use closureScope.thisObj so unqualified members (e.g., fields) resolve to the instance
|
val callScope: Scope,
|
||||||
// we captured, not to the caller's `this` (e.g., FlowBuilder).
|
val closureScope: Scope,
|
||||||
|
private val preferredThisType: String? = null
|
||||||
|
) :
|
||||||
Scope(callScope, callScope.args, thisObj = closureScope.thisObj) {
|
Scope(callScope, callScope.args, thisObj = closureScope.thisObj) {
|
||||||
|
|
||||||
init {
|
init {
|
||||||
// Preserve the lexical class context of the closure by default. This ensures that lambdas
|
val desired = preferredThisType?.let { typeName ->
|
||||||
// created inside a class method keep access to that class's private/protected members even
|
callScope.thisVariants.firstOrNull { it.objClass.className == typeName }
|
||||||
// when executed from within another object's method (e.g., Mutex.withLock), which may set
|
}
|
||||||
// its own currentClassCtx temporarily. If the closure has no class context, inherit caller's.
|
val primaryThis = closureScope.thisObj
|
||||||
|
val merged = ArrayList<Obj>(callScope.thisVariants.size + closureScope.thisVariants.size + 1)
|
||||||
|
desired?.let { merged.add(it) }
|
||||||
|
merged.addAll(callScope.thisVariants)
|
||||||
|
merged.addAll(closureScope.thisVariants)
|
||||||
|
setThisVariants(primaryThis, merged)
|
||||||
this.currentClassCtx = closureScope.currentClassCtx ?: callScope.currentClassCtx
|
this.currentClassCtx = closureScope.currentClassCtx ?: callScope.currentClassCtx
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun get(name: String): ObjRecord? {
|
|
||||||
if (name == "this") return thisObj.asReadonly
|
|
||||||
|
|
||||||
// 1. Current frame locals (parameters, local variables)
|
|
||||||
tryGetLocalRecord(this, name, currentClassCtx)?.let { return it }
|
|
||||||
|
|
||||||
// 2. Lexical environment (captured locals from entire ancestry)
|
|
||||||
closureScope.chainLookupIgnoreClosure(name, followClosure = true, caller = currentClassCtx)?.let { return it }
|
|
||||||
|
|
||||||
// 3. Lexical this members (captured receiver)
|
|
||||||
val receiver = thisObj
|
|
||||||
val effectiveClass = receiver as? ObjClass ?: receiver.objClass
|
|
||||||
for (cls in effectiveClass.mro) {
|
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
|
||||||
if (rec != null && !rec.isAbstract) {
|
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
|
||||||
return rec.copy(receiver = receiver)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
// Finally, root object fallback
|
|
||||||
Obj.rootObjectType.members[name]?.let { rec ->
|
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
|
||||||
return rec.copy(receiver = receiver)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
// 4. Call environment (caller locals, caller this, and global fallback)
|
|
||||||
return callScope.get(name)
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
class ApplyScope(_parent: Scope,val applied: Scope) : Scope(_parent, thisObj = applied.thisObj) {
|
class ApplyScope(val callScope: Scope, val applied: Scope) :
|
||||||
|
Scope(callScope, thisObj = applied.thisObj) {
|
||||||
|
|
||||||
override fun get(name: String): ObjRecord? {
|
override fun get(name: String): ObjRecord? {
|
||||||
return applied.get(name) ?: super.get(name)
|
return applied.get(name) ?: super.get(name)
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun applyClosure(closure: Scope): Scope {
|
override fun applyClosure(closure: Scope, preferredThisType: String?): Scope {
|
||||||
return this
|
return BytecodeClosureScope(this, closure, preferredThisType)
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
@@ -19,8 +19,24 @@ package net.sergeych.lyng
|
|||||||
|
|
||||||
sealed class CodeContext {
|
sealed class CodeContext {
|
||||||
class Module(@Suppress("unused") val packageName: String?): CodeContext()
|
class Module(@Suppress("unused") val packageName: String?): CodeContext()
|
||||||
class Function(val name: String): CodeContext()
|
class Function(
|
||||||
|
val name: String,
|
||||||
|
val implicitThisMembers: Boolean = false,
|
||||||
|
val implicitThisTypeName: String? = null,
|
||||||
|
val typeParams: Set<String> = emptySet(),
|
||||||
|
val typeParamDecls: List<TypeDecl.TypeParam> = emptyList()
|
||||||
|
): CodeContext()
|
||||||
class ClassBody(val name: String, val isExtern: Boolean = false): CodeContext() {
|
class ClassBody(val name: String, val isExtern: Boolean = false): CodeContext() {
|
||||||
|
var typeParams: Set<String> = emptySet()
|
||||||
|
var typeParamDecls: List<TypeDecl.TypeParam> = emptyList()
|
||||||
val pendingInitializations = mutableMapOf<String, Pos>()
|
val pendingInitializations = mutableMapOf<String, Pos>()
|
||||||
|
val declaredMembers = mutableSetOf<String>()
|
||||||
|
val classScopeMembers = mutableSetOf<String>()
|
||||||
|
val memberOverrides = mutableMapOf<String, Boolean>()
|
||||||
|
val memberFieldIds = mutableMapOf<String, Int>()
|
||||||
|
val memberMethodIds = mutableMapOf<String, Int>()
|
||||||
|
var nextFieldId: Int = 0
|
||||||
|
var nextMethodId: Int = 0
|
||||||
|
var slotPlanId: Int? = null
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
File diff suppressed because it is too large.
Load diff
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -35,8 +35,9 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
|
|
||||||
var currentIndex = 0
|
var currentIndex = 0
|
||||||
private var pendingGT = 0
|
private var pendingGT = 0
|
||||||
|
private var pendingAssign = false
|
||||||
|
|
||||||
fun hasNext() = currentIndex < tokens.size || pendingGT > 0
|
fun hasNext() = currentIndex < tokens.size || pendingGT > 0 || pendingAssign
|
||||||
fun hasPrevious() = currentIndex > 0
|
fun hasPrevious() = currentIndex > 0
|
||||||
fun next(): Token {
|
fun next(): Token {
|
||||||
if (pendingGT > 0) {
|
if (pendingGT > 0) {
|
||||||
@@ -44,6 +45,11 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
val last = tokens[currentIndex - 1]
|
val last = tokens[currentIndex - 1]
|
||||||
return Token(">", last.pos.copy(column = last.pos.column + 1), Token.Type.GT)
|
return Token(">", last.pos.copy(column = last.pos.column + 1), Token.Type.GT)
|
||||||
}
|
}
|
||||||
|
if (pendingAssign) {
|
||||||
|
pendingAssign = false
|
||||||
|
val last = tokens[currentIndex - 1]
|
||||||
|
return Token("=", last.pos.copy(column = last.pos.column + 1), Token.Type.ASSIGN)
|
||||||
|
}
|
||||||
return if (currentIndex < tokens.size) tokens[currentIndex++]
|
return if (currentIndex < tokens.size) tokens[currentIndex++]
|
||||||
else Token("", tokens.last().pos, Token.Type.EOF)
|
else Token("", tokens.last().pos, Token.Type.EOF)
|
||||||
}
|
}
|
||||||
@@ -52,16 +58,19 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
pendingGT++
|
pendingGT++
|
||||||
}
|
}
|
||||||
|
|
||||||
fun previous() = if (pendingGT > 0) {
|
fun pushPendingAssign() {
|
||||||
pendingGT-- // This is wrong, previous should go back.
|
pendingAssign = true
|
||||||
// But we don't really use previous() in generics parser after splitting.
|
}
|
||||||
throw IllegalStateException("previous() not supported after pushPendingGT")
|
|
||||||
|
fun previous() = if (pendingGT > 0 || pendingAssign) {
|
||||||
|
throw IllegalStateException("previous() not supported after pushPending tokens")
|
||||||
} else if (!hasPrevious()) throw IllegalStateException("No previous token") else tokens[--currentIndex]
|
} else if (!hasPrevious()) throw IllegalStateException("No previous token") else tokens[--currentIndex]
|
||||||
|
|
||||||
fun savePos() = (currentIndex shl 2) or (pendingGT and 3)
|
fun savePos() = (currentIndex shl 3) or (pendingGT and 3) or (if (pendingAssign) 4 else 0)
|
||||||
fun restorePos(pos: Int) {
|
fun restorePos(pos: Int) {
|
||||||
currentIndex = pos shr 2
|
currentIndex = pos shr 3
|
||||||
pendingGT = pos and 3
|
pendingGT = pos and 3
|
||||||
|
pendingAssign = (pos and 4) != 0
|
||||||
}
|
}
|
||||||
|
|
||||||
fun ensureLabelIsValid(pos: Pos, label: String) {
|
fun ensureLabelIsValid(pos: Pos, label: String) {
|
||||||
@@ -238,7 +247,7 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Token.Type.MULTILINE_COMMENT, Token.Type.SINLGE_LINE_COMMENT, Token.Type.NEWLINE -> {}
|
Token.Type.MULTILINE_COMMENT, Token.Type.SINGLE_LINE_COMMENT, Token.Type.NEWLINE -> {}
|
||||||
else -> {
|
else -> {
|
||||||
restorePos(pos); return false
|
restorePos(pos); return false
|
||||||
}
|
}
|
||||||
@@ -265,6 +274,6 @@ class CompilerContext(val tokens: List<Token>) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
val wstokens = setOf(Token.Type.NEWLINE, Token.Type.MULTILINE_COMMENT, Token.Type.SINLGE_LINE_COMMENT)
|
val wstokens = setOf(Token.Type.NEWLINE, Token.Type.MULTILINE_COMMENT, Token.Type.SINGLE_LINE_COMMENT)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,37 @@
|
|||||||
|
/*
|
||||||
|
* 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 DelegatedVarDeclStatement(
|
||||||
|
val name: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val initializer: Statement,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val slotIndex: Int?,
|
||||||
|
val scopeId: Int?,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(context: Scope): Obj {
|
||||||
|
return bytecodeOnly(context, "delegated var declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.ListLiteralRef
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
|
||||||
|
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 {
|
||||||
|
return bytecodeOnly(context, "destructuring declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,38 @@
|
|||||||
|
/*
|
||||||
|
* 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(
|
||||||
|
val declaredName: String,
|
||||||
|
val qualifiedName: String,
|
||||||
|
val entries: List<String>,
|
||||||
|
val lifted: Boolean,
|
||||||
|
private val startPos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return bytecodeOnly(scope, "enum declaration")
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val target = scope.parent ?: scope
|
||||||
|
return execute(target)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
internal fun extensionCallableName(typeName: String, memberName: String): String {
|
||||||
|
return "__ext__${sanitizeExtensionTypeName(typeName)}__${memberName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun extensionPropertyGetterName(typeName: String, memberName: String): String {
|
||||||
|
return "__ext_get__${sanitizeExtensionTypeName(typeName)}__${memberName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun extensionPropertySetterName(typeName: String, memberName: String): String {
|
||||||
|
return "__ext_set__${sanitizeExtensionTypeName(typeName)}__${memberName}"
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun sanitizeExtensionTypeName(typeName: String): String {
|
||||||
|
return typeName.replace('.', '_')
|
||||||
|
}
|
||||||
@@ -0,0 +1,34 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.obj.Obj
|
||||||
|
import net.sergeych.lyng.obj.ObjProperty
|
||||||
|
|
||||||
|
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 {
|
||||||
|
return bytecodeOnly(context, "extension property declaration")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,93 @@
|
|||||||
|
/*
|
||||||
|
* 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() {
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
val resolvedOther = when (other) {
|
||||||
|
is FrameSlotRef -> other.read()
|
||||||
|
is RecordSlotRef -> other.read()
|
||||||
|
else -> other
|
||||||
|
}
|
||||||
|
return read().compareTo(scope, resolvedOther)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun read(): Obj {
|
||||||
|
val typeCode = frame.getSlotTypeCode(slot)
|
||||||
|
return when (typeCode) {
|
||||||
|
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 -> frame.getObj(slot)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun refersTo(frame: FrameAccess, slot: Int): Boolean {
|
||||||
|
return this.frame === frame && this.slot == slot
|
||||||
|
}
|
||||||
|
|
||||||
|
fun write(value: Obj) {
|
||||||
|
when (value) {
|
||||||
|
is ObjInt -> frame.setInt(slot, value.value)
|
||||||
|
is ObjReal -> frame.setReal(slot, value.value)
|
||||||
|
is ObjBool -> frame.setBool(slot, value.value)
|
||||||
|
else -> frame.setObj(slot, value)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class RecordSlotRef(
|
||||||
|
private val record: ObjRecord,
|
||||||
|
) : net.sergeych.lyng.obj.Obj() {
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
val resolvedOther = when (other) {
|
||||||
|
is FrameSlotRef -> other.read()
|
||||||
|
is RecordSlotRef -> other.read()
|
||||||
|
else -> other
|
||||||
|
}
|
||||||
|
return read().compareTo(scope, resolvedOther)
|
||||||
|
}
|
||||||
|
|
||||||
|
fun read(): Obj {
|
||||||
|
val direct = record.value
|
||||||
|
return if (direct is FrameSlotRef) direct.read() else direct
|
||||||
|
}
|
||||||
|
|
||||||
|
fun write(value: Obj) {
|
||||||
|
record.value = value
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,251 @@
|
|||||||
|
/*
|
||||||
|
* 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.ObjExternCallable
|
||||||
|
import net.sergeych.lyng.obj.ObjExtensionMethodCallable
|
||||||
|
import net.sergeych.lyng.obj.ObjInstance
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
import net.sergeych.lyng.obj.ObjUnset
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class FunctionClosureBox(
|
||||||
|
var closure: Scope? = null,
|
||||||
|
var captureContext: Scope? = null,
|
||||||
|
var captureRecords: List<ObjRecord>? = null,
|
||||||
|
)
|
||||||
|
|
||||||
|
data class FunctionDeclSpec(
|
||||||
|
val name: String,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isStatic: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val isDelegated: Boolean,
|
||||||
|
val delegateExpression: Statement?,
|
||||||
|
val delegateInitStatement: Statement?,
|
||||||
|
val extTypeName: String?,
|
||||||
|
val extensionWrapperName: String?,
|
||||||
|
val memberMethodId: Int?,
|
||||||
|
val actualExtern: Boolean,
|
||||||
|
val parentIsClassBody: Boolean,
|
||||||
|
val externCallSignature: CallSignature?,
|
||||||
|
val annotation: (suspend (Scope, ObjString, Statement) -> Statement)?,
|
||||||
|
val fnBody: Statement,
|
||||||
|
val closureBox: FunctionClosureBox,
|
||||||
|
val captureSlots: List<CaptureSlot>,
|
||||||
|
val slotIndex: Int?,
|
||||||
|
val scopeId: Int?,
|
||||||
|
val startPos: Pos,
|
||||||
|
)
|
||||||
|
|
||||||
|
internal suspend fun executeFunctionDecl(
|
||||||
|
scope: Scope,
|
||||||
|
spec: FunctionDeclSpec,
|
||||||
|
captureRecords: List<ObjRecord>? = null
|
||||||
|
): Obj {
|
||||||
|
spec.closureBox.captureRecords = captureRecords
|
||||||
|
if (spec.actualExtern && spec.extTypeName == null && !spec.parentIsClassBody) {
|
||||||
|
val existing = scope.get(spec.name)
|
||||||
|
if (existing != null) {
|
||||||
|
val value = (existing.value as? ObjExternCallable) ?: ObjExternCallable.wrap(existing.value)
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
value,
|
||||||
|
spec.visibility,
|
||||||
|
callSignature = existing.callSignature
|
||||||
|
)
|
||||||
|
return value
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.isDelegated) {
|
||||||
|
val delegateExpr = spec.delegateExpression ?: scope.raiseError("delegated function missing delegate")
|
||||||
|
val accessType = ObjString("Callable")
|
||||||
|
val initValue = executeBytecodeWithSeed(scope, delegateExpr, "delegated function")
|
||||||
|
val finalDelegate = try {
|
||||||
|
initValue.invokeInstanceMethod(scope, "bind", Arguments(ObjString(spec.name), accessType, scope.thisObj))
|
||||||
|
} catch (e: Exception) {
|
||||||
|
initValue
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.extTypeName != null) {
|
||||||
|
val type = scope[spec.extTypeName]?.value ?: scope.raiseSymbolNotFound("class ${spec.extTypeName} not found")
|
||||||
|
if (type !is ObjClass) scope.raiseClassCastError("${spec.extTypeName} is not the class instance")
|
||||||
|
scope.addExtension(
|
||||||
|
type,
|
||||||
|
spec.name,
|
||||||
|
ObjRecord(ObjUnset, isMutable = false, visibility = spec.visibility, declaringClass = null, type = ObjRecord.Type.Delegated).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
)
|
||||||
|
return finalDelegate
|
||||||
|
}
|
||||||
|
|
||||||
|
val th = scope.thisObj
|
||||||
|
if (spec.isStatic) {
|
||||||
|
(th as ObjClass).createClassField(
|
||||||
|
spec.name,
|
||||||
|
ObjUnset,
|
||||||
|
false,
|
||||||
|
spec.visibility,
|
||||||
|
null,
|
||||||
|
spec.startPos,
|
||||||
|
isTransient = spec.isTransient,
|
||||||
|
type = ObjRecord.Type.Delegated
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
ObjUnset,
|
||||||
|
spec.visibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isTransient = spec.isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
} else if (th is ObjClass) {
|
||||||
|
val cls: ObjClass = th
|
||||||
|
cls.createField(
|
||||||
|
spec.name,
|
||||||
|
ObjUnset,
|
||||||
|
false,
|
||||||
|
spec.visibility,
|
||||||
|
null,
|
||||||
|
spec.startPos,
|
||||||
|
declaringClass = cls,
|
||||||
|
isAbstract = spec.isAbstract,
|
||||||
|
isClosed = spec.isClosed,
|
||||||
|
isOverride = spec.isOverride,
|
||||||
|
isTransient = spec.isTransient,
|
||||||
|
type = ObjRecord.Type.Delegated,
|
||||||
|
methodId = spec.memberMethodId
|
||||||
|
)
|
||||||
|
val initStmt = spec.delegateInitStatement
|
||||||
|
?: scope.raiseIllegalState("missing delegated init statement for ${spec.name}")
|
||||||
|
cls.instanceInitializers += requireBytecodeBody(scope, initStmt, "delegated function init")
|
||||||
|
} else {
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
ObjUnset,
|
||||||
|
spec.visibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isTransient = spec.isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return finalDelegate
|
||||||
|
}
|
||||||
|
|
||||||
|
if (spec.isStatic || !spec.parentIsClassBody) {
|
||||||
|
spec.closureBox.closure = scope
|
||||||
|
}
|
||||||
|
if (spec.parentIsClassBody) {
|
||||||
|
spec.closureBox.captureContext = scope
|
||||||
|
}
|
||||||
|
|
||||||
|
val annotatedFnBody = spec.annotation?.invoke(scope, ObjString(spec.name), spec.fnBody) ?: spec.fnBody
|
||||||
|
val compiledFnBody = annotatedFnBody
|
||||||
|
|
||||||
|
spec.extTypeName?.let { typeName ->
|
||||||
|
val type = scope[typeName]?.value ?: scope.raiseSymbolNotFound("class $typeName not found")
|
||||||
|
if (type !is ObjClass) scope.raiseClassCastError("$typeName is not the class instance")
|
||||||
|
scope.addExtension(
|
||||||
|
type,
|
||||||
|
spec.name,
|
||||||
|
ObjRecord(
|
||||||
|
compiledFnBody,
|
||||||
|
isMutable = false,
|
||||||
|
visibility = spec.visibility,
|
||||||
|
declaringClass = null,
|
||||||
|
type = ObjRecord.Type.Fun
|
||||||
|
)
|
||||||
|
)
|
||||||
|
val wrapperName = spec.extensionWrapperName ?: extensionCallableName(typeName, spec.name)
|
||||||
|
val wrapper = ObjExtensionMethodCallable(spec.name, compiledFnBody)
|
||||||
|
scope.addItem(wrapperName, false, wrapper, spec.visibility, recordType = ObjRecord.Type.Fun)
|
||||||
|
} ?: run {
|
||||||
|
val th = scope.thisObj
|
||||||
|
if (!spec.isStatic && th is ObjClass) {
|
||||||
|
val cls: ObjClass = th
|
||||||
|
cls.createField(
|
||||||
|
spec.name,
|
||||||
|
compiledFnBody,
|
||||||
|
isMutable = true,
|
||||||
|
visibility = spec.visibility,
|
||||||
|
pos = spec.startPos,
|
||||||
|
declaringClass = cls,
|
||||||
|
isAbstract = spec.isAbstract,
|
||||||
|
isClosed = spec.isClosed,
|
||||||
|
isOverride = spec.isOverride,
|
||||||
|
type = ObjRecord.Type.Fun,
|
||||||
|
methodId = spec.memberMethodId
|
||||||
|
)
|
||||||
|
val memberValue = cls.members[spec.name]?.value ?: compiledFnBody
|
||||||
|
scope.addItem(spec.name, false, memberValue, spec.visibility, callSignature = spec.externCallSignature)
|
||||||
|
compiledFnBody
|
||||||
|
} else {
|
||||||
|
scope.addItem(
|
||||||
|
spec.name,
|
||||||
|
false,
|
||||||
|
compiledFnBody,
|
||||||
|
spec.visibility,
|
||||||
|
recordType = ObjRecord.Type.Fun,
|
||||||
|
callSignature = spec.externCallSignature
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return annotatedFnBody
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun requireBytecodeBody(
|
||||||
|
scope: Scope,
|
||||||
|
stmt: Statement,
|
||||||
|
label: String
|
||||||
|
): net.sergeych.lyng.bytecode.BytecodeStatement {
|
||||||
|
val bytecode = when (stmt) {
|
||||||
|
is net.sergeych.lyng.bytecode.BytecodeStatement -> stmt
|
||||||
|
is BytecodeBodyProvider -> stmt.bytecodeBody()
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
return bytecode ?: scope.raiseIllegalState("$label requires bytecode statement")
|
||||||
|
}
|
||||||
|
|
||||||
|
class FunctionDeclStatement(
|
||||||
|
val spec: FunctionDeclSpec,
|
||||||
|
) : Statement() {
|
||||||
|
override val pos: Pos = spec.startPos
|
||||||
|
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
return executeFunctionDecl(scope, spec)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val target = scope.parent ?: scope
|
||||||
|
return executeFunctionDecl(target, spec)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
sealed class ImportBindingSource {
|
||||||
|
data class Module(val name: String, val pos: Pos) : ImportBindingSource()
|
||||||
|
object Root : ImportBindingSource()
|
||||||
|
object Seed : ImportBindingSource()
|
||||||
|
}
|
||||||
|
|
||||||
|
data class ImportBinding(
|
||||||
|
val symbol: String,
|
||||||
|
val source: ImportBindingSource,
|
||||||
|
)
|
||||||
@@ -0,0 +1,46 @@
|
|||||||
|
/*
|
||||||
|
* 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 = requireBytecodeBody(scope, stmt, "inline block").execute(scope)
|
||||||
|
}
|
||||||
|
return last
|
||||||
|
}
|
||||||
|
|
||||||
|
fun statements(): List<Statement> = statements
|
||||||
|
|
||||||
|
private suspend fun requireBytecodeBody(scope: Scope, stmt: Statement, label: String): net.sergeych.lyng.bytecode.BytecodeStatement {
|
||||||
|
val bytecode = when (stmt) {
|
||||||
|
is net.sergeych.lyng.bytecode.BytecodeStatement -> stmt
|
||||||
|
is BytecodeBodyProvider -> stmt.bytecodeBody()
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
return bytecode ?: scope.raiseIllegalState("$label requires bytecode statement")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,139 @@
|
|||||||
|
/*
|
||||||
|
* 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.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.ObjProperty
|
||||||
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
import net.sergeych.lyng.obj.ObjUnset
|
||||||
|
import net.sergeych.lyng.obj.ObjVoid
|
||||||
|
|
||||||
|
class InstanceFieldInitStatement(
|
||||||
|
val storageName: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val isLateInitVal: Boolean,
|
||||||
|
val initializer: Statement?,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val initValue = initializer?.let { execBytecodeOnly(scope, it, "instance field init") }?.byValueCopy()
|
||||||
|
?: if (isLateInitVal) ObjUnset else ObjNull
|
||||||
|
scope.addItem(
|
||||||
|
storageName,
|
||||||
|
isMutable,
|
||||||
|
initValue,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Field,
|
||||||
|
isAbstract = isAbstract,
|
||||||
|
isClosed = isClosed,
|
||||||
|
isOverride = isOverride,
|
||||||
|
isTransient = isTransient
|
||||||
|
)
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun execBytecodeOnly(scope: Scope, stmt: Statement, label: String): Obj {
|
||||||
|
val bytecode = when (stmt) {
|
||||||
|
is net.sergeych.lyng.bytecode.BytecodeStatement -> stmt
|
||||||
|
is BytecodeBodyProvider -> stmt.bytecodeBody()
|
||||||
|
else -> null
|
||||||
|
} ?: scope.raiseIllegalState("$label requires bytecode statement")
|
||||||
|
return bytecode.execute(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class InstancePropertyInitStatement(
|
||||||
|
val storageName: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val prop: ObjProperty,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
scope.addItem(
|
||||||
|
storageName,
|
||||||
|
isMutable,
|
||||||
|
prop,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Property,
|
||||||
|
isAbstract = isAbstract,
|
||||||
|
isClosed = isClosed,
|
||||||
|
isOverride = isOverride,
|
||||||
|
isTransient = isTransient
|
||||||
|
)
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
class InstanceDelegatedInitStatement(
|
||||||
|
val storageName: String,
|
||||||
|
val memberName: String,
|
||||||
|
val isMutable: Boolean,
|
||||||
|
val visibility: Visibility,
|
||||||
|
val writeVisibility: Visibility?,
|
||||||
|
val isAbstract: Boolean,
|
||||||
|
val isClosed: Boolean,
|
||||||
|
val isOverride: Boolean,
|
||||||
|
val isTransient: Boolean,
|
||||||
|
val accessTypeLabel: String,
|
||||||
|
val initializer: Statement,
|
||||||
|
override val pos: Pos,
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj {
|
||||||
|
val initValue = executeBytecodeWithSeed(scope, initializer, "instance delegated init")
|
||||||
|
val accessType = ObjString(accessTypeLabel)
|
||||||
|
val finalDelegate = try {
|
||||||
|
initValue.invokeInstanceMethod(
|
||||||
|
scope,
|
||||||
|
"bind",
|
||||||
|
Arguments(ObjString(memberName), accessType, scope.thisObj)
|
||||||
|
)
|
||||||
|
} catch (_: Exception) {
|
||||||
|
initValue
|
||||||
|
}
|
||||||
|
scope.addItem(
|
||||||
|
storageName,
|
||||||
|
isMutable,
|
||||||
|
ObjUnset,
|
||||||
|
visibility,
|
||||||
|
writeVisibility,
|
||||||
|
recordType = ObjRecord.Type.Delegated,
|
||||||
|
isAbstract = isAbstract,
|
||||||
|
isClosed = isClosed,
|
||||||
|
isOverride = isOverride,
|
||||||
|
isTransient = isTransient
|
||||||
|
).apply {
|
||||||
|
delegate = finalDelegate
|
||||||
|
}
|
||||||
|
return ObjVoid
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,8 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import net.sergeych.lyng.bytecode.BytecodeFrame
|
||||||
|
import net.sergeych.lyng.bytecode.CmdFunction
|
||||||
import net.sergeych.lyng.obj.ObjRecord
|
import net.sergeych.lyng.obj.ObjRecord
|
||||||
import net.sergeych.lyng.obj.ObjString
|
import net.sergeych.lyng.obj.ObjString
|
||||||
import net.sergeych.lyng.pacman.ImportProvider
|
import net.sergeych.lyng.pacman.ImportProvider
|
||||||
@@ -33,6 +35,29 @@ 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()
|
||||||
|
internal var moduleFrame: BytecodeFrame? = null
|
||||||
|
internal var moduleFrameLocalCount: Int = -1
|
||||||
|
internal var moduleFrameLocalSlotNames: Array<String?> = emptyArray()
|
||||||
|
internal var moduleFrameLocalSlotMutables: BooleanArray = BooleanArray(0)
|
||||||
|
internal var moduleFrameLocalSlotDelegated: BooleanArray = BooleanArray(0)
|
||||||
|
|
||||||
|
internal fun ensureModuleFrame(fn: CmdFunction): BytecodeFrame {
|
||||||
|
val current = moduleFrame
|
||||||
|
val frame = if (current == null || moduleFrameLocalCount != fn.localCount) {
|
||||||
|
BytecodeFrame(fn.localCount, 0).also {
|
||||||
|
moduleFrame = it
|
||||||
|
moduleFrameLocalCount = fn.localCount
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
current
|
||||||
|
}
|
||||||
|
moduleFrameLocalSlotNames = fn.localSlotNames
|
||||||
|
moduleFrameLocalSlotMutables = fn.localSlotMutables
|
||||||
|
moduleFrameLocalSlotDelegated = fn.localSlotDelegated
|
||||||
|
return frame
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Import symbols into the scope. It _is called_ after the module is imported by [ImportProvider.prepareImport]
|
* Import symbols into the scope. It _is called_ after the module is imported by [ImportProvider.prepareImport]
|
||||||
* which checks symbol availability and accessibility prior to execution.
|
* which checks symbol availability and accessibility prior to execution.
|
||||||
@@ -59,6 +84,7 @@ class ModuleScope(
|
|||||||
// when importing records, we keep track of its package (not otherwise needed)
|
// when importing records, we keep track of its package (not otherwise needed)
|
||||||
if (record.importedFrom == null) record.importedFrom = this
|
if (record.importedFrom == null) record.importedFrom = this
|
||||||
scope.objects[newName] = record
|
scope.objects[newName] = record
|
||||||
|
scope.updateSlotFor(newName, record)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -91,5 +117,3 @@ class ModuleScope(
|
|||||||
super.get(name)
|
super.get(name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
Loaded 100 of 319 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user