Compare commits
31
Commits
1efa96a990
...
1.2.1
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f357f4039b | ||
|
|
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 |
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,8 @@
|
|||||||
|
# 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.
|
||||||
+12
-1
@@ -2,6 +2,11 @@
|
|||||||
|
|
||||||
### Unreleased
|
### Unreleased
|
||||||
|
|
||||||
|
- Language: Refined `protected` visibility rules
|
||||||
|
- Ancestor classes can now access `protected` members of their descendants, provided the ancestor also defines or inherits a member with the same name (indicating an override of a member known to the ancestor).
|
||||||
|
- This allows patterns where a base class calls a `protected` method that is implemented in a subclass.
|
||||||
|
- Fixed a regression where self-calls to unmangled members sometimes bypassed visibility checks incorrectly; these are now handled by the refined logic.
|
||||||
|
|
||||||
- Language: Added `return` statement
|
- Language: Added `return` statement
|
||||||
- `return [expression]` exits the innermost enclosing callable (function or lambda).
|
- `return [expression]` exits the innermost enclosing callable (function or lambda).
|
||||||
- Supports non-local returns using `@label` syntax (e.g., `return@outer 42`).
|
- Supports non-local returns using `@label` syntax (e.g., `return@outer 42`).
|
||||||
@@ -21,6 +26,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 +101,7 @@
|
|||||||
- Header-specified constructor arguments are passed to direct bases.
|
- Header-specified constructor arguments are passed to direct bases.
|
||||||
- Visibility enforcement under MI:
|
- Visibility enforcement under MI:
|
||||||
- `private` visible only inside the declaring class body.
|
- `private` visible only inside the declaring class body.
|
||||||
- `protected` visible inside the declaring class and any of its transitive subclasses; unrelated contexts cannot access it (qualification/casts do not bypass).
|
- `protected` visible inside the declaring class and its transitive subclasses. Additionally, ancestor classes can access protected members of their descendants if it's an override of a member known to the ancestor. Unrelated contexts cannot access it (qualification/casts do not bypass).
|
||||||
- Diagnostics improvements:
|
- Diagnostics improvements:
|
||||||
- Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
|
- Missing member/field messages include receiver class and linearization order; hints for `this@Type` or casts when helpful.
|
||||||
- Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.
|
- Invalid `this@Type` reports that the qualifier is not an ancestor and shows the receiver lineage.
|
||||||
|
|||||||
+106
@@ -0,0 +1,106 @@
|
|||||||
|
# Lyng Language AI Specification (V1.3)
|
||||||
|
|
||||||
|
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.
|
||||||
|
|
||||||
|
## 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.
|
||||||
|
|
||||||
|
## 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 `Map()`.
|
||||||
|
- **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`.
|
||||||
|
|
||||||
|
## 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.
|
||||||
@@ -45,6 +45,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
|
||||||
|
|
||||||
@@ -140,6 +141,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/++.
|
||||||
|
|||||||
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
|
||||||
+17
-5
@@ -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,6 +116,8 @@ function refreshTextmateZip() {
|
|||||||
(cd editors && zip -rq ../distributables/lyng-textmate.zip .)
|
(cd editors && zip -rq ../distributables/lyng-textmate.zip .)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
if [[ "$upload_only" == false ]]; then
|
||||||
# Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
|
# Update the IDEA plugin download link in docs (temporarily), then build, then restore the doc
|
||||||
refreshTextmateZip
|
refreshTextmateZip
|
||||||
updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
|
updateIdeaPluginDownloadLink || echo "WARN: proceeding without updating IDEA plugin download link"
|
||||||
@@ -125,9 +136,7 @@ if [[ $BUILD_RC -ne 0 ]]; then
|
|||||||
echo
|
echo
|
||||||
exit 100
|
exit 100
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
#exit 0
|
|
||||||
|
|
||||||
# Prepare working dir
|
# Prepare working dir
|
||||||
ssh -p ${SSH_PORT} ${SSH_HOST} "
|
ssh -p ${SSH_PORT} ${SSH_HOST} "
|
||||||
@@ -143,12 +152,15 @@ ssh -p ${SSH_PORT} ${SSH_HOST} "
|
|||||||
fi
|
fi
|
||||||
";
|
";
|
||||||
|
|
||||||
|
if [[ "$upload_only" == false ]]; then
|
||||||
# sync files
|
# sync files
|
||||||
SRC=./site/build/dist/js/productionExecutable
|
SRC=./site/build/dist/js/productionExecutable
|
||||||
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
|
rsync -e "ssh -p ${SSH_PORT}" -avz -r -d --delete ${SRC}/* ${SSH_HOST}:${ROOT}/build/dist
|
||||||
checkState
|
checkState
|
||||||
#rsync -e "ssh -p ${SSH_PORT}" -avz ./static/* ${SSH_HOST}:${ROOT}/build/dist
|
#rsync -e "ssh -p ${SSH_PORT}" -avz ./static/* ${SSH_HOST}:${ROOT}/build/dist
|
||||||
#checkState
|
#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
|
||||||
|
|
||||||
|
|||||||
+31
-10
@@ -425,7 +425,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 +857,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 {
|
||||||
|
abstract protected fun foo()
|
||||||
|
|
||||||
|
fun bar() {
|
||||||
|
// Ancestor can see foo() because it's an override
|
||||||
|
// of a member it defines (even as abstract):
|
||||||
|
foo()
|
||||||
}
|
}
|
||||||
class B() : A() {
|
|
||||||
fun call() { this@A.ping() }
|
|
||||||
}
|
}
|
||||||
|
|
||||||
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
|
||||||
|
|||||||
+4
-3
@@ -98,10 +98,11 @@ 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 |
|
| start | | Any? |
|
||||||
| end | | Bool |
|
| end | | Any? |
|
||||||
| size | for finite ranges, see above | Long |
|
| size | for finite ranges, see above | Long |
|
||||||
| [] | see above | |
|
| [] | see above | |
|
||||||
| | | |
|
|
||||||
|
Ranges are also used with the `clamp(value, range)` function and the `value.clamp(range)` extension method to limit values within boundaries.
|
||||||
|
|
||||||
[Iterable]: Iterable.md
|
[Iterable]: Iterable.md
|
||||||
@@ -19,6 +19,7 @@ you can use it's class to ensure type:
|
|||||||
|-----------------|-------------------------------------------------------------|------|
|
|-----------------|-------------------------------------------------------------|------|
|
||||||
| `.roundToInt()` | round to nearest int like round(x) | Int |
|
| `.roundToInt()` | round to nearest int like round(x) | Int |
|
||||||
| `.toInt()` | convert integer part of real to `Int` dropping decimal part | Int |
|
| `.toInt()` | convert integer part of real to `Int` dropping decimal part | Int |
|
||||||
|
| `.clamp(range)` | clamp value within range boundaries | Real |
|
||||||
| | | |
|
| | | |
|
||||||
| | | |
|
| | | |
|
||||||
| | | |
|
| | | |
|
||||||
|
|||||||
@@ -0,0 +1,15 @@
|
|||||||
|
# AI notes: avoid Kotlin/Wasm invalid IR with suspend lambdas
|
||||||
|
|
||||||
|
## Do
|
||||||
|
- Prefer explicit `object : Statement()` with `override suspend fun execute(...)` when building compiler statements.
|
||||||
|
- Keep `Statement` objects non-lambda, especially in compiler hot paths like parsing/var declarations.
|
||||||
|
- If you need conditional behavior, return early in `execute` instead of wrapping `parseExpression()` with `statement(...) { ... }`.
|
||||||
|
- When wasmJs tests hang in the browser, first check `wasmJsNodeTest` for a compile error; hangs often mean module instantiation failed.
|
||||||
|
|
||||||
|
## Don't
|
||||||
|
- Do not create suspend lambdas inside `Statement` factories (`statement { ... }`) for wasm targets.
|
||||||
|
- Do not "fix" hangs by increasing browser timeouts; it masks invalid wasm generation.
|
||||||
|
|
||||||
|
## Debugging tips
|
||||||
|
- Look for `$invokeCOROUTINE$` in wasm function names when mapping failures.
|
||||||
|
- If node test logs a wasm compile error, the browser hang is likely the same root cause.
|
||||||
@@ -20,7 +20,18 @@ Simple classes serialization is supported:
|
|||||||
assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
|
assertEquals( "{\"foo\":1,\"bar\":2}", Point(1,2).toJsonString() )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
Note that mutable members are serialized:
|
Note that mutable members are serialized by default. You can exclude any member (including constructor parameters) from JSON serialization using the `@Transient` attribute:
|
||||||
|
|
||||||
|
import lyng.serialization
|
||||||
|
|
||||||
|
class Point2(@Transient val foo, val bar) {
|
||||||
|
@Transient var reason = 42
|
||||||
|
var visible = 100
|
||||||
|
}
|
||||||
|
assertEquals( "{\"bar\":2,\"visible\":100}", Point2(1,2).toJsonString() )
|
||||||
|
>>> void
|
||||||
|
|
||||||
|
Note that if you override json serialization:
|
||||||
|
|
||||||
import lyng.serialization
|
import lyng.serialization
|
||||||
|
|
||||||
|
|||||||
@@ -92,6 +92,7 @@ or transformed `Real` otherwise.
|
|||||||
| pow(x, y) | ${x^y}$ |
|
| pow(x, y) | ${x^y}$ |
|
||||||
| sqrt(x) | $ \sqrt {x}$ |
|
| sqrt(x) | $ \sqrt {x}$ |
|
||||||
| abs(x) | absolute value of x. Int if x is Int, Real otherwise |
|
| abs(x) | absolute value of x. Int if x is Int, Real otherwise |
|
||||||
|
| clamp(x, range) | limit x to be inside range boundaries |
|
||||||
|
|
||||||
For example:
|
For example:
|
||||||
|
|
||||||
@@ -102,6 +103,11 @@ For example:
|
|||||||
// abs() keeps the argument type:
|
// abs() keeps the argument type:
|
||||||
assert( abs(-1) is Int)
|
assert( abs(-1) is Int)
|
||||||
assert( abs(-2.21) == 2.21 )
|
assert( abs(-2.21) == 2.21 )
|
||||||
|
|
||||||
|
// clamp() limits value to the range:
|
||||||
|
assert( clamp(15, 0..10) == 10 )
|
||||||
|
assert( clamp(-5, 0..10) == 0 )
|
||||||
|
assert( 5.clamp(0..10) == 5 )
|
||||||
>>> void
|
>>> void
|
||||||
|
|
||||||
## Scientific constant
|
## Scientific constant
|
||||||
|
|||||||
@@ -1,7 +1,6 @@
|
|||||||
#!/bin/env lyng
|
#!/bin/env lyng
|
||||||
|
|
||||||
import lyng.io.fs
|
import lyng.io.fs
|
||||||
import lyng.stdlib
|
|
||||||
|
|
||||||
val files = Path("../..").list().toList()
|
val files = Path("../..").list().toList()
|
||||||
// most long is longest?
|
// most long is longest?
|
||||||
|
|||||||
+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:
|
||||||
|
|
||||||
|
|||||||
+72
-133
@@ -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
|
// constructing from a number is treated as seconds since unix epoch:
|
||||||
|
val t2 = Instant(1704110400) // 2024-01-01T12:00:00Z
|
||||||
|
|
||||||
import lyng.time
|
// from RFC3339 string:
|
||||||
|
val t3 = Instant("2024-01-01T12:00:00.123456Z")
|
||||||
|
|
||||||
// empty constructor gives current time instant using system clock:
|
// truncation:
|
||||||
val now = Instant()
|
val t4 = t3.truncateToMinute
|
||||||
|
assertEquals(t4.toRFC3339(), "2024-01-01T12:00:00Z")
|
||||||
|
|
||||||
// constructor with Instant instance makes a copy:
|
// to localized DateTime (uses system default TZ if not specified):
|
||||||
assertEquals( now, Instant(now) )
|
val dt = t3.toDateTime("+02:00")
|
||||||
|
assertEquals(dt.hour, 14)
|
||||||
|
|
||||||
// constructing from a number is trated as seconds since unix epoch:
|
### Instant members
|
||||||
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()
|
|
||||||
|
|
||||||
// you cam add or subtract periods, and compare
|
|
||||||
assert( now - 5.minutes < now )
|
|
||||||
val oneHourAgo = now - 1.hour
|
|
||||||
assertEquals( now, oneHourAgo + 1.hour)
|
|
||||||
|
|
||||||
>>> void
|
|
||||||
|
|
||||||
## 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.
|
||||||
|
|
||||||
|
### Constructing
|
||||||
|
|
||||||
|
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 |
|
| member | description |
|
||||||
|--------------------------------|----------------------------------------------|
|
|----------------------------------|-----------------------------------------------|
|
||||||
| Instant.now() | create new instance with current system time |
|
| year: Int | year component |
|
||||||
| Instant.distantPast: Instant | most distant instant in past |
|
| month: Int | month component (1..12) |
|
||||||
| Instant.distantFuture: Instant | most distant instant in future |
|
| 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 |
|
||||||
|
|
||||||
# `Duraion` class
|
### 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`.
|
||||||
|
|
||||||
|
|||||||
+12
-3
@@ -1252,7 +1252,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
|
||||||
@@ -1471,13 +1471,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 +1704,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
|
||||||
|
|||||||
@@ -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.
|
||||||
@@ -24,6 +24,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
|
||||||
@@ -168,6 +171,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
|
||||||
|
|||||||
@@ -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" }
|
||||||
|
|||||||
@@ -0,0 +1,144 @@
|
|||||||
|
/*
|
||||||
|
* 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.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(this).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(this).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
|
||||||
|
}
|
||||||
|
}
|
||||||
+4
-62
@@ -44,10 +44,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
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 Error(val start: Int, val end: Int, val message: String)
|
||||||
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 error: Error? = null)
|
||||||
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,6 +59,7 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
if (collectedInfo == null) return null
|
if (collectedInfo == null) return null
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
val text = collectedInfo.text
|
val text = collectedInfo.text
|
||||||
|
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
||||||
|
|
||||||
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
// Use LyngAstManager to get the (potentially merged) Mini-AST
|
||||||
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
val mini = LyngAstManager.getMiniAst(collectedInfo.file)
|
||||||
@@ -224,8 +222,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
// Heuristics on top of binder: function call-sites and simple name-based roles
|
// Heuristics on top of binder: function call-sites and simple name-based roles
|
||||||
ProgressManager.checkCanceled()
|
ProgressManager.checkCanceled()
|
||||||
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
|
|
||||||
// Build simple name -> role map for top-level vals/vars and parameters
|
// Build simple name -> role map for top-level vals/vars and parameters
|
||||||
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
val nameRole = HashMap<String, com.intellij.openapi.editor.colors.TextAttributesKey>(8)
|
||||||
mini.declarations.forEach { d ->
|
mini.declarations.forEach { d ->
|
||||||
@@ -280,7 +276,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
|
|
||||||
// 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() }
|
|
||||||
tokens.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
|
||||||
@@ -320,9 +315,6 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Map Enum constants from token highlighter to IDEA enum constant color
|
|
||||||
run {
|
|
||||||
val tokens = try { SimpleLyngHighlighter().highlight(text) } catch (_: Throwable) { emptyList() }
|
|
||||||
tokens.forEach { s ->
|
tokens.forEach { s ->
|
||||||
if (s.kind == HighlightKind.EnumConstant) {
|
if (s.kind == HighlightKind.EnumConstant) {
|
||||||
val start = s.range.start
|
val start = s.range.start
|
||||||
@@ -332,34 +324,10 @@ class LyngExternalAnnotator : ExternalAnnotator<LyngExternalAnnotator.Input, Lyn
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
return Result(collectedInfo.modStamp, out, null)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Build spell index payload: identifiers from symbols + references; comments/strings from simple highlighter
|
|
||||||
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
|
||||||
@@ -371,32 +339,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))
|
||||||
|
|||||||
+74
-17
@@ -139,7 +139,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}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -361,7 +361,7 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
"Print values to the standard output and append a newline. Accepts any number of arguments." else
|
"Print values to the standard output and append a newline. Accepts any number of arguments." else
|
||||||
"Print values to the standard output without a trailing newline. Accepts any number of arguments."
|
"Print values to the standard output without a trailing newline. Accepts any number of arguments."
|
||||||
val title = "function $ident(values)"
|
val title = "function $ident(values)"
|
||||||
return "<div class='doc-title'>${htmlEscape(title)}</div>" + styledMarkdown(htmlEscape(fallback))
|
return renderTitle(title) + styledMarkdown(htmlEscape(fallback))
|
||||||
}
|
}
|
||||||
// 4b) try class members like ClassName.member with inheritance fallback
|
// 4b) try class members like ClassName.member with inheritance fallback
|
||||||
val lhs = previousWordBefore(text, idRange.startOffset)
|
val lhs = previousWordBefore(text, idRange.startOffset)
|
||||||
@@ -518,18 +518,26 @@ class LyngDocumentationProvider : AbstractDocumentationProvider() {
|
|||||||
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()
|
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 {
|
||||||
@@ -540,11 +548,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()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -553,11 +559,9 @@ 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()
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -575,6 +579,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) {
|
||||||
@@ -641,7 +649,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>")
|
||||||
@@ -663,6 +671,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)
|
||||||
|
|||||||
@@ -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
|
|
||||||
log.info("LyngTextExtractor active; allowedDomains=${allowedDomains.joinToString()}")
|
|
||||||
}
|
|
||||||
val settings = LyngFormatterSettings.getInstance(element.project)
|
|
||||||
val file = element.containingFile
|
|
||||||
val index = if (file != null) LyngSpellIndex.getUpToDate(file) else null
|
|
||||||
val r = element.textRange
|
|
||||||
|
|
||||||
fun overlaps(list: List<com.intellij.openapi.util.TextRange>): Boolean = r != null && list.any { it.intersects(r) }
|
val domain = when (type) {
|
||||||
|
|
||||||
// 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
|
LyngTokenTypes.LINE_COMMENT, LyngTokenTypes.BLOCK_COMMENT -> TextDomain.COMMENTS
|
||||||
else -> null
|
LyngTokenTypes.STRING -> TextDomain.LITERALS
|
||||||
|
LyngElementTypes.NAME_IDENTIFIER,
|
||||||
|
LyngElementTypes.PARAMETER_NAME,
|
||||||
|
LyngElementTypes.ENUM_CONSTANT_NAME -> TextDomain.COMMENTS
|
||||||
|
else -> return null
|
||||||
}
|
}
|
||||||
}
|
|
||||||
if (domain == null) return null
|
|
||||||
|
|
||||||
// If literals aren't requested but fallback is enabled, route strings as COMMENTS
|
if (!allowedDomains.contains(domain)) return null
|
||||||
if (domain == TextDomain.LITERALS && !allowedDomains.contains(TextDomain.LITERALS) && settings.grazieTreatLiteralsAsComments) {
|
|
||||||
domain = TextDomain.COMMENTS
|
return TextContent.psiFragment(domain, element)
|
||||||
}
|
|
||||||
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
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -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.
|
||||||
@@ -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>()
|
||||||
|
|
||||||
|
|||||||
@@ -38,16 +38,18 @@ class LyngPsiReference(element: PsiElement) : PsiPolyVariantReferenceBase<PsiEle
|
|||||||
|
|
||||||
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
val mini = LyngAstManager.getMiniAst(file) ?: return emptyArray()
|
||||||
val binding = LyngAstManager.getBinding(file)
|
val binding = LyngAstManager.getBinding(file)
|
||||||
|
val imported = DocLookupUtils.canonicalImportedModules(mini, text).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)
|
|
||||||
|
|
||||||
if (receiverClass != null) {
|
if (receiverClass != null) {
|
||||||
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported, receiverClass, name, mini)
|
val resolved = DocLookupUtils.resolveMemberWithInheritance(imported.toList(), receiverClass, name, mini)
|
||||||
if (resolved != null) {
|
if (resolved != null) {
|
||||||
val owner = resolved.first
|
val owner = resolved.first
|
||||||
val member = resolved.second
|
val member = resolved.second
|
||||||
@@ -75,7 +77,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 +96,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 +143,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 +166,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
|
||||||
|
|
||||||
|
|||||||
@@ -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}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
+13
-142
@@ -16,155 +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<*> {
|
|
||||||
if (element is com.intellij.psi.PsiFile) return EMPTY_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 et = element.node?.elementType
|
|
||||||
val index = LyngSpellIndex.getUpToDate(file)
|
|
||||||
|
|
||||||
// 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
|
|
||||||
|
|
||||||
if (index == null) {
|
|
||||||
// Index not ready: fall back to Lexer-based token types.
|
|
||||||
// Identifiers are safe because LyngLexer separates keywords from identifiers.
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.IDENTIFIER) {
|
|
||||||
return if (grazieIds) EMPTY_TOKENIZER else IDENTIFIER_TOKENIZER
|
|
||||||
}
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.LINE_COMMENT || et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.BLOCK_COMMENT) {
|
|
||||||
return if (preferGrazie) EMPTY_TOKENIZER else COMMENT_TEXT_TOKENIZER
|
|
||||||
}
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.STRING && settings.spellCheckStringLiterals) {
|
|
||||||
return if (preferGrazie) EMPTY_TOKENIZER else STRING_WITH_PRINTF_EXCLUDES
|
|
||||||
}
|
|
||||||
return EMPTY_TOKENIZER
|
|
||||||
}
|
|
||||||
|
|
||||||
val elRange = element.textRange ?: return EMPTY_TOKENIZER
|
|
||||||
fun overlaps(list: List<TextRange>) = list.any { it.intersects(elRange) }
|
|
||||||
|
|
||||||
// Identifiers: only if range is within identifiers index and not delegated to Grazie
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.IDENTIFIER && overlaps(index.identifiers) && !grazieIds) return IDENTIFIER_TOKENIZER
|
|
||||||
|
|
||||||
// Comments: only if not delegated to Grazie and overlapping indexed comments
|
|
||||||
if ((et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.LINE_COMMENT || et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.BLOCK_COMMENT) && overlaps(index.comments) && !preferGrazie) return COMMENT_TEXT_TOKENIZER
|
|
||||||
|
|
||||||
// Strings: only if not delegated to Grazie, literals checking enabled, and overlapping indexed strings
|
|
||||||
if (et == net.sergeych.lyng.idea.highlight.LyngTokenTypes.STRING && settings.spellCheckStringLiterals && overlaps(index.strings) && !preferGrazie) 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 = com.intellij.spellchecker.inspections.IdentifierSplitter.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,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"/>
|
||||||
|
|||||||
@@ -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,7 +22,6 @@
|
|||||||
-->
|
-->
|
||||||
<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>
|
||||||
|
|||||||
@@ -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
|
|
||||||
@@ -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.2.1"
|
||||||
|
|
||||||
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
// Removed legacy buildscript classpath declarations; plugins are applied via the plugins DSL below
|
||||||
|
|
||||||
@@ -97,6 +97,7 @@ kotlin {
|
|||||||
kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
|
kotlin.srcDir("$buildDir/generated/buildConfig/commonMain/kotlin")
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
implementation("org.jetbrains.kotlinx:kotlinx-serialization-json:1.9.0")
|
||||||
|
implementation("org.jetbrains.kotlinx:kotlinx-datetime:0.6.1")
|
||||||
//put your multiplatform dependencies here
|
//put your multiplatform dependencies here
|
||||||
api(libs.kotlinx.coroutines.core)
|
api(libs.kotlinx.coroutines.core)
|
||||||
api(libs.mp.bintools)
|
api(libs.mp.bintools)
|
||||||
|
|||||||
@@ -0,0 +1,28 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
actual object Benchmarks {
|
||||||
|
actual val enabled: Boolean = run {
|
||||||
|
val p = System.getProperty("LYNG_BENCHMARKS")?.lowercase()
|
||||||
|
val e = System.getenv("BENCHMARKS")?.lowercase()
|
||||||
|
fun parse(v: String?): Boolean =
|
||||||
|
v == "true" || v == "1" || v == "yes"
|
||||||
|
parse(p) || parse(e)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -71,7 +71,8 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
value.byValueCopy(),
|
value.byValueCopy(),
|
||||||
a.visibility ?: defaultVisibility,
|
a.visibility ?: defaultVisibility,
|
||||||
recordType = ObjRecord.Type.Argument,
|
recordType = ObjRecord.Type.Argument,
|
||||||
declaringClass = declaringClass)
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient)
|
||||||
}
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -82,7 +83,8 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
value.byValueCopy(),
|
value.byValueCopy(),
|
||||||
a.visibility ?: defaultVisibility,
|
a.visibility ?: defaultVisibility,
|
||||||
recordType = ObjRecord.Type.Argument,
|
recordType = ObjRecord.Type.Argument,
|
||||||
declaringClass = declaringClass)
|
declaringClass = declaringClass,
|
||||||
|
isTransient = a.isTransient)
|
||||||
}
|
}
|
||||||
|
|
||||||
// Prepare positional args and parameter count, handle tail-block binding
|
// Prepare positional args and parameter count, handle tail-block binding
|
||||||
@@ -239,5 +241,6 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
|
|||||||
val defaultValue: Statement? = null,
|
val defaultValue: Statement? = null,
|
||||||
val accessType: AccessType? = null,
|
val accessType: AccessType? = null,
|
||||||
val visibility: Visibility? = null,
|
val visibility: Visibility? = null,
|
||||||
|
val isTransient: Boolean = false,
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
@@ -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
|
||||||
|
}
|
||||||
@@ -54,14 +54,14 @@ class ClosureScope(val callScope: Scope, val closureScope: Scope) :
|
|||||||
for (cls in effectiveClass.mro) {
|
for (cls in effectiveClass.mro) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null && !rec.isAbstract) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Finally, root object fallback
|
// Finally, root object fallback
|
||||||
Obj.rootObjectType.members[name]?.let { rec ->
|
Obj.rootObjectType.members[name]?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
File diff suppressed because it is too large.
Load diff
@@ -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) {
|
||||||
|
|||||||
@@ -112,7 +112,7 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.objects[name]?.let { rec ->
|
s.objects[name]?.let { rec ->
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
caller?.let { ctx ->
|
caller?.let { ctx ->
|
||||||
s.localBindings[ctx.mangledName(name)]?.let { rec ->
|
s.localBindings[ctx.mangledName(name)]?.let { rec ->
|
||||||
@@ -120,11 +120,11 @@ open class Scope(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
s.localBindings[name]?.let { rec ->
|
s.localBindings[name]?.let { rec ->
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
s.getSlotIndexOf(name)?.let { idx ->
|
s.getSlotIndexOf(name)?.let { idx ->
|
||||||
val rec = s.getSlotRecord(idx)
|
val rec = s.getSlotRecord(idx)
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, caller, name)) return rec
|
||||||
}
|
}
|
||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
@@ -163,7 +163,7 @@ open class Scope(
|
|||||||
this.extensions[cls]?.get(name)?.let { return it }
|
this.extensions[cls]?.get(name)?.let { return it }
|
||||||
}
|
}
|
||||||
return thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
return thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx, name)) {
|
||||||
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
|
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
|
||||||
else rec
|
else rec
|
||||||
} else null
|
} else null
|
||||||
@@ -186,7 +186,7 @@ open class Scope(
|
|||||||
s.extensions[cls]?.get(name)?.let { return it }
|
s.extensions[cls]?.get(name)?.let { return it }
|
||||||
}
|
}
|
||||||
s.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
s.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, caller)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, caller, name)) {
|
||||||
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) {
|
if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) {
|
||||||
// ignore fields, properties and abstracts here, they will be handled by the caller via readField
|
// ignore fields, properties and abstracts here, they will be handled by the caller via readField
|
||||||
} else return rec
|
} else return rec
|
||||||
@@ -358,14 +358,14 @@ open class Scope(
|
|||||||
for (cls in effectiveClass.mro) {
|
for (cls in effectiveClass.mro) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
||||||
if (rec != null && !rec.isAbstract) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
// Finally, root object fallback
|
// Finally, root object fallback
|
||||||
Obj.rootObjectType.members[name]?.let { rec ->
|
Obj.rootObjectType.members[name]?.let { rec ->
|
||||||
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
|
if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx, name)) {
|
||||||
return rec.copy(receiver = receiver)
|
return rec.copy(receiver = receiver)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -392,6 +392,24 @@ open class Scope(
|
|||||||
nameToSlot[name]?.let { slots[it] = record }
|
nameToSlot[name]?.let { slots[it] = record }
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Apply a precomputed slot plan (name -> slot index) for this scope.
|
||||||
|
* This enables direct slot references to bypass name-based lookup.
|
||||||
|
*/
|
||||||
|
fun applySlotPlan(plan: Map<String, Int>) {
|
||||||
|
if (plan.isEmpty()) return
|
||||||
|
val maxIndex = plan.values.maxOrNull() ?: return
|
||||||
|
if (slots.size <= maxIndex) {
|
||||||
|
val targetSize = maxIndex + 1
|
||||||
|
while (slots.size < targetSize) {
|
||||||
|
slots.add(ObjRecord(ObjUnset, isMutable = true))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for ((name, idx) in plan) {
|
||||||
|
nameToSlot[name] = idx
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Clear all references and maps to prevent memory leaks when pooled.
|
* Clear all references and maps to prevent memory leaks when pooled.
|
||||||
*/
|
*/
|
||||||
@@ -503,6 +521,7 @@ open class Scope(
|
|||||||
if (this is ClosureScope) {
|
if (this is ClosureScope) {
|
||||||
callScope.localBindings[name] = it
|
callScope.localBindings[name] = it
|
||||||
}
|
}
|
||||||
|
bumpClassLayoutIfNeeded(name, value, recordType)
|
||||||
it
|
it
|
||||||
} ?: addItem(name, true, value, visibility, writeVisibility, recordType, isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride)
|
} ?: addItem(name, true, value, visibility, writeVisibility, recordType, isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride)
|
||||||
|
|
||||||
@@ -516,7 +535,8 @@ open class Scope(
|
|||||||
declaringClass: net.sergeych.lyng.obj.ObjClass? = currentClassCtx,
|
declaringClass: net.sergeych.lyng.obj.ObjClass? = currentClassCtx,
|
||||||
isAbstract: Boolean = false,
|
isAbstract: Boolean = false,
|
||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false
|
isOverride: Boolean = false,
|
||||||
|
isTransient: Boolean = false
|
||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
val rec = ObjRecord(
|
val rec = ObjRecord(
|
||||||
value, isMutable, visibility, writeVisibility,
|
value, isMutable, visibility, writeVisibility,
|
||||||
@@ -524,9 +544,28 @@ open class Scope(
|
|||||||
type = recordType,
|
type = recordType,
|
||||||
isAbstract = isAbstract,
|
isAbstract = isAbstract,
|
||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride
|
isOverride = isOverride,
|
||||||
|
isTransient = isTransient
|
||||||
)
|
)
|
||||||
objects[name] = rec
|
objects[name] = rec
|
||||||
|
bumpClassLayoutIfNeeded(name, value, recordType)
|
||||||
|
if (recordType == ObjRecord.Type.Field || recordType == ObjRecord.Type.ConstructorField) {
|
||||||
|
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
||||||
|
if (inst != null) {
|
||||||
|
val slot = inst.objClass.fieldSlotForKey(name)
|
||||||
|
if (slot != null) inst.setFieldSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (value is Statement ||
|
||||||
|
recordType == ObjRecord.Type.Fun ||
|
||||||
|
recordType == ObjRecord.Type.Delegated ||
|
||||||
|
recordType == ObjRecord.Type.Property) {
|
||||||
|
val inst = thisObj as? net.sergeych.lyng.obj.ObjInstance
|
||||||
|
if (inst != null) {
|
||||||
|
val slot = inst.objClass.methodSlotForKey(name)
|
||||||
|
if (slot != null) inst.setMethodSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
// Index this binding within the current frame to help resolve locals across suspension
|
// Index this binding within the current frame to help resolve locals across suspension
|
||||||
localBindings[name] = rec
|
localBindings[name] = rec
|
||||||
// If we are a ClosureScope, mirror binding into the caller frame to keep it discoverable
|
// If we are a ClosureScope, mirror binding into the caller frame to keep it discoverable
|
||||||
@@ -556,6 +595,14 @@ open class Scope(
|
|||||||
return rec
|
return rec
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private fun bumpClassLayoutIfNeeded(name: String, value: Obj, recordType: ObjRecord.Type) {
|
||||||
|
val cls = thisObj as? net.sergeych.lyng.obj.ObjClass ?: return
|
||||||
|
if (cls.classScope !== this) return
|
||||||
|
if (!(value is Statement || recordType == ObjRecord.Type.Fun || recordType == ObjRecord.Type.Delegated)) return
|
||||||
|
if (cls.members.containsKey(name)) return
|
||||||
|
cls.layoutVersion += 1
|
||||||
|
}
|
||||||
|
|
||||||
fun getOrCreateNamespace(name: String): ObjClass {
|
fun getOrCreateNamespace(name: String): ObjClass {
|
||||||
val ns = objects.getOrPut(name) { ObjRecord(ObjNamespace(name), isMutable = false) }.value
|
val ns = objects.getOrPut(name) { ObjRecord(ObjNamespace(name), isMutable = false) }.value
|
||||||
return ns.objClass
|
return ns.objClass
|
||||||
|
|||||||
@@ -20,10 +20,7 @@ package net.sergeych.lyng
|
|||||||
import kotlinx.coroutines.delay
|
import kotlinx.coroutines.delay
|
||||||
import kotlinx.coroutines.yield
|
import kotlinx.coroutines.yield
|
||||||
import net.sergeych.lyng.Script.Companion.defaultImportManager
|
import net.sergeych.lyng.Script.Companion.defaultImportManager
|
||||||
import net.sergeych.lyng.miniast.addConstDoc
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lyng.miniast.addFnDoc
|
|
||||||
import net.sergeych.lyng.miniast.addVoidFnDoc
|
|
||||||
import net.sergeych.lyng.miniast.type
|
|
||||||
import net.sergeych.lyng.obj.*
|
import net.sergeych.lyng.obj.*
|
||||||
import net.sergeych.lyng.pacman.ImportManager
|
import net.sergeych.lyng.pacman.ImportManager
|
||||||
import net.sergeych.lyng.stdlib_included.rootLyng
|
import net.sergeych.lyng.stdlib_included.rootLyng
|
||||||
@@ -162,6 +159,42 @@ class Script(
|
|||||||
if (x is ObjInt) ObjInt(x.value.absoluteValue) else ObjReal(x.toDouble().absoluteValue)
|
if (x is ObjInt) ObjInt(x.value.absoluteValue) else ObjReal(x.toDouble().absoluteValue)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
"clamp",
|
||||||
|
doc = "Clamps the value within the specified range. If the value is outside the range, it is set to the nearest boundary. Respects inclusive/exclusive range ends.",
|
||||||
|
params = listOf(ParamDoc("value"), ParamDoc("range")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
val value = requiredArg<Obj>(0)
|
||||||
|
val range = requiredArg<ObjRange>(1)
|
||||||
|
|
||||||
|
var result = value
|
||||||
|
if (range.start != null && !range.start.isNull) {
|
||||||
|
if (result.compareTo(this, range.start) < 0) {
|
||||||
|
result = range.start
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (range.end != null && !range.end.isNull) {
|
||||||
|
val cmp = range.end.compareTo(this, result)
|
||||||
|
if (range.isEndInclusive) {
|
||||||
|
if (cmp < 0) result = range.end
|
||||||
|
} else {
|
||||||
|
if (cmp <= 0) {
|
||||||
|
if (range.end is ObjInt) {
|
||||||
|
result = ObjInt.of(range.end.value - 1)
|
||||||
|
} else if (range.end is ObjChar) {
|
||||||
|
result = ObjChar((range.end.value.code - 1).toChar())
|
||||||
|
} else {
|
||||||
|
// For types where we can't easily find "previous" value (like Real),
|
||||||
|
// we just return the exclusive boundary as a fallback.
|
||||||
|
result = range.end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
|
|
||||||
addVoidFn("assert") {
|
addVoidFn("assert") {
|
||||||
val cond = requiredArg<ObjBool>(0)
|
val cond = requiredArg<ObjBool>(0)
|
||||||
val message = if (args.size > 1)
|
val message = if (args.size > 1)
|
||||||
@@ -399,6 +432,12 @@ class Script(
|
|||||||
doc = "Point in time (epoch-based).",
|
doc = "Point in time (epoch-based).",
|
||||||
type = type("lyng.Class")
|
type = type("lyng.Class")
|
||||||
)
|
)
|
||||||
|
it.addConstDoc(
|
||||||
|
name = "DateTime",
|
||||||
|
value = ObjDateTime.type,
|
||||||
|
doc = "Point in time in a specific time zone.",
|
||||||
|
type = type("lyng.Class")
|
||||||
|
)
|
||||||
it.addConstDoc(
|
it.addConstDoc(
|
||||||
name = "Duration",
|
name = "Duration",
|
||||||
value = ObjDuration.type,
|
value = ObjDuration.type,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -25,7 +25,12 @@ enum class Visibility {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** MI-aware visibility check: whether [caller] can access a member declared in [decl] with [visibility]. */
|
/** MI-aware visibility check: whether [caller] can access a member declared in [decl] with [visibility]. */
|
||||||
fun canAccessMember(visibility: Visibility, decl: net.sergeych.lyng.obj.ObjClass?, caller: net.sergeych.lyng.obj.ObjClass?): Boolean {
|
fun canAccessMember(
|
||||||
|
visibility: Visibility,
|
||||||
|
decl: net.sergeych.lyng.obj.ObjClass?,
|
||||||
|
caller: net.sergeych.lyng.obj.ObjClass?,
|
||||||
|
name: String? = null
|
||||||
|
): Boolean {
|
||||||
val res = when (visibility) {
|
val res = when (visibility) {
|
||||||
Visibility.Public -> true
|
Visibility.Public -> true
|
||||||
Visibility.Private -> (decl != null && caller === decl)
|
Visibility.Private -> (decl != null && caller === decl)
|
||||||
@@ -33,7 +38,14 @@ fun canAccessMember(visibility: Visibility, decl: net.sergeych.lyng.obj.ObjClass
|
|||||||
decl == null -> false
|
decl == null -> false
|
||||||
caller == null -> false
|
caller == null -> false
|
||||||
caller === decl -> true
|
caller === decl -> true
|
||||||
else -> (caller.allParentsSet.contains(decl))
|
caller.allParentsSet.contains(decl) -> true
|
||||||
|
name != null && decl.allParentsSet.contains(caller) -> {
|
||||||
|
// Ancestor can access protected member of its descendant if it also has this member
|
||||||
|
// (i.e. it's an override of something the ancestor knows about)
|
||||||
|
val existing = caller.getInstanceMemberOrNull(name, includeAbstract = true)
|
||||||
|
existing != null && (existing.visibility == Visibility.Protected || existing.visibility == Visibility.Public)
|
||||||
|
}
|
||||||
|
else -> false
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return res
|
return res
|
||||||
|
|||||||
@@ -100,11 +100,17 @@ object LyngFormatter {
|
|||||||
fun isControlHeaderNoBrace(s: String): Boolean {
|
fun isControlHeaderNoBrace(s: String): Boolean {
|
||||||
val t = s.trim()
|
val t = s.trim()
|
||||||
if (t.isEmpty()) return false
|
if (t.isEmpty()) return false
|
||||||
// match: if (...) | else if (...) | else
|
// match: if (...) | else if (...) | else | catch (...) | finally
|
||||||
val isIf = Regex("^if\\s*\\(.*\\)\\s*$").matches(t)
|
if (Regex("^if\\s*\\(.*\\)$").matches(t)) return true
|
||||||
val isElseIf = Regex("^else\\s+if\\s*\\(.*\\)\\s*$").matches(t)
|
if (Regex("^else\\s+if\\s*\\(.*\\)$").matches(t)) return true
|
||||||
val isElse = t == "else"
|
if (t == "else") return true
|
||||||
if (isIf || isElseIf || isElse) return true
|
if (Regex("^catch\\s*\\(.*\\)$").matches(t)) return true
|
||||||
|
if (t == "finally") return true
|
||||||
|
|
||||||
|
// Short definition form: fun x() = or val x =
|
||||||
|
// We allow optional 'static' as well
|
||||||
|
if (Regex("^(static\\s+)?(override\\s+)?(fun|fn)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
if (Regex("^(static\\s+)?(private\\s+|protected\\s+|public\\s+|override\\s+)?(val|var)\\b.*=\\s*$").matches(t)) return true
|
||||||
|
|
||||||
// property accessors ending with ) or =
|
// property accessors ending with ) or =
|
||||||
if (isAccessorRelated(t)) {
|
if (isAccessorRelated(t)) {
|
||||||
@@ -113,11 +119,24 @@ object LyngFormatter {
|
|||||||
return false
|
return false
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun isDoubleIndentHeader(s: String): Boolean {
|
||||||
|
val t = s.trim()
|
||||||
|
if (!t.endsWith("=")) return false
|
||||||
|
// Is it a function or property definition?
|
||||||
|
// (Note: we exclude 'static' here to avoid double indent if it's already handled)
|
||||||
|
if (Regex("^(override\\s+)?(fun|fn|val|var)\\b").containsMatchIn(t)) return true
|
||||||
|
// Is it an accessor?
|
||||||
|
if (isPropertyAccessor(t)) return true
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
|
||||||
for ((i, rawLine) in lines.withIndex()) {
|
for ((i, rawLine) in lines.withIndex()) {
|
||||||
val (parts, nextInBlockComment) = splitIntoParts(rawLine, inBlockComment)
|
val (parts, nextInBlockComment) = splitIntoParts(rawLine, inBlockComment)
|
||||||
val code = parts.filter { it.type == PartType.Code }.joinToString("") { it.text }
|
val code = parts.filter { it.type == PartType.Code }.joinToString("") { it.text }
|
||||||
|
val codeAndStrings = parts.filter { it.type != PartType.BlockComment && it.type != PartType.LineComment }.joinToString("") { it.text }
|
||||||
val trimmedStart = code.dropWhile { it == ' ' || it == '\t' }
|
val trimmedStart = code.dropWhile { it == ' ' || it == '\t' }
|
||||||
val trimmedLine = rawLine.trim()
|
val trimmedLine = rawLine.trim()
|
||||||
|
val trimmedCodeAndStrings = codeAndStrings.trim()
|
||||||
|
|
||||||
// Compute effective indent level for this line
|
// Compute effective indent level for this line
|
||||||
val currentExtraIndent = extraIndents.sum()
|
val currentExtraIndent = extraIndents.sum()
|
||||||
@@ -138,9 +157,15 @@ object LyngFormatter {
|
|||||||
|
|
||||||
// Single-line control header (if/else/else if) without braces: indent the next
|
// Single-line control header (if/else/else if) without braces: indent the next
|
||||||
// non-empty, non-'}', non-'else' line by one extra level
|
// non-empty, non-'}', non-'else' line by one extra level
|
||||||
|
val isContinuation = trimmedStart.startsWith("else") || trimmedStart.startsWith("catch") || trimmedStart.startsWith("finally")
|
||||||
val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
|
val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
|
||||||
!trimmedStart.startsWith("else") && !trimmedStart.startsWith("}")
|
!trimmedStart.startsWith("}")
|
||||||
if (applyAwaiting) effectiveLevel += awaitingExtraIndent
|
var actualAwaiting = 0
|
||||||
|
if (applyAwaiting) {
|
||||||
|
actualAwaiting = awaitingExtraIndent
|
||||||
|
if (isContinuation) actualAwaiting = (actualAwaiting - 1).coerceAtLeast(0)
|
||||||
|
effectiveLevel += actualAwaiting
|
||||||
|
}
|
||||||
|
|
||||||
val firstChar = trimmedStart.firstOrNull()
|
val firstChar = trimmedStart.firstOrNull()
|
||||||
// While inside parentheses, continuation applies scaled by nesting level
|
// While inside parentheses, continuation applies scaled by nesting level
|
||||||
@@ -194,7 +219,7 @@ object LyngFormatter {
|
|||||||
val newBlockLevel = blockLevel
|
val newBlockLevel = blockLevel
|
||||||
if (newBlockLevel > oldBlockLevel) {
|
if (newBlockLevel > oldBlockLevel) {
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
||||||
val addedThisLine = (if (applyAwaiting) awaitingExtraIndent else 0) + (if (isAccessorRelatedLine) 1 else 0)
|
val addedThisLine = actualAwaiting + (if (isAccessorRelatedLine) 1 else 0)
|
||||||
repeat(newBlockLevel - oldBlockLevel) {
|
repeat(newBlockLevel - oldBlockLevel) {
|
||||||
extraIndents.add(addedThisLine)
|
extraIndents.add(addedThisLine)
|
||||||
}
|
}
|
||||||
@@ -207,23 +232,29 @@ object LyngFormatter {
|
|||||||
inBlockComment = nextInBlockComment
|
inBlockComment = nextInBlockComment
|
||||||
|
|
||||||
// Update awaitingExtraIndent based on current line
|
// Update awaitingExtraIndent based on current line
|
||||||
|
val nextLineTrimmed = lines.getOrNull(i + 1)?.trim() ?: ""
|
||||||
|
val nextIsContinuation = nextLineTrimmed.startsWith("else") ||
|
||||||
|
nextLineTrimmed.startsWith("catch") ||
|
||||||
|
nextLineTrimmed.startsWith("finally")
|
||||||
|
|
||||||
if (applyAwaiting && trimmedStart.isNotEmpty()) {
|
if (applyAwaiting && trimmedStart.isNotEmpty()) {
|
||||||
// we have just applied it.
|
// we have just applied it.
|
||||||
val endsWithBrace = code.trimEnd().endsWith("{")
|
val endsWithBrace = code.trimEnd().endsWith("{")
|
||||||
if (!endsWithBrace && isControlHeaderNoBrace(code)) {
|
if (!endsWithBrace && isControlHeaderNoBrace(trimmedCodeAndStrings)) {
|
||||||
// It's another header, increment
|
// It's another header, increment
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorOrDouble = isAccessor || (!inBlockComment && isAccessorRelated(code)) || isDoubleIndentHeader(trimmedCodeAndStrings)
|
||||||
awaitingExtraIndent += if (isAccessorRelatedLine) 2 else 1
|
val increment = if (isAccessorOrDouble) 2 else 1
|
||||||
} else {
|
awaitingExtraIndent = actualAwaiting + increment
|
||||||
// It's the body, reset
|
} else if (!nextIsContinuation) {
|
||||||
|
// It's the body, and no continuation follows, so reset
|
||||||
awaitingExtraIndent = 0
|
awaitingExtraIndent = 0
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// start awaiting if current line is a control header without '{'
|
// start awaiting if current line is a control header without '{'
|
||||||
val endsWithBrace = code.trimEnd().endsWith("{")
|
val endsWithBrace = code.trimEnd().endsWith("{")
|
||||||
if (!endsWithBrace && isControlHeaderNoBrace(code)) {
|
if (!endsWithBrace && isControlHeaderNoBrace(trimmedCodeAndStrings)) {
|
||||||
val isAccessorRelatedLine = isAccessor || (!inBlockComment && isAccessorRelated(code))
|
val isAccessorOrDouble = isAccessor || (!inBlockComment && isAccessorRelated(code)) || isDoubleIndentHeader(trimmedCodeAndStrings)
|
||||||
awaitingExtraIndent = if (isAccessorRelatedLine) 2 else 1
|
awaitingExtraIndent = if (isAccessorOrDouble) 2 else 1
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -42,7 +42,7 @@ private val fallbackKeywordIds = setOf(
|
|||||||
"and", "or", "not",
|
"and", "or", "not",
|
||||||
// declarations & modifiers
|
// declarations & modifiers
|
||||||
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
"fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
|
||||||
"abstract", "closed", "override",
|
"abstract", "closed", "override", "public", "lazy", "dynamic",
|
||||||
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
"private", "protected", "static", "open", "extern", "init", "get", "set", "by",
|
||||||
// control flow and misc
|
// control flow and misc
|
||||||
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
"if", "else", "when", "while", "do", "for", "try", "catch", "finally",
|
||||||
|
|||||||
@@ -255,8 +255,7 @@ class ClassDocsBuilder internal constructor(private val className: String) {
|
|||||||
private fun builtinRange() = MiniRange(Pos.builtIn, Pos.builtIn)
|
private fun builtinRange() = MiniRange(Pos.builtIn, Pos.builtIn)
|
||||||
|
|
||||||
private fun miniDoc(text: String, tags: Map<String, List<String>>): MiniDoc {
|
private fun miniDoc(text: String, tags: Map<String, List<String>>): MiniDoc {
|
||||||
val summary = text.lineSequence().map { it.trim() }.firstOrNull { it.isNotEmpty() }
|
return MiniDoc.parse(builtinRange(), listOf(text), tags)
|
||||||
return MiniDoc(range = builtinRange(), raw = text, summary = summary, tags = tags)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun TypeDoc.toDisplayName(): String = when (this) {
|
private fun TypeDoc.toDisplayName(): String = when (this) {
|
||||||
|
|||||||
@@ -239,6 +239,9 @@ object CompletionEngineLight {
|
|||||||
fun addMembersOf(name: String, direct: Boolean) {
|
fun addMembersOf(name: String, direct: Boolean) {
|
||||||
val cls = classes[name] ?: return
|
val cls = classes[name] ?: return
|
||||||
val target = if (direct) directMap else inheritedMap
|
val target = if (direct) directMap else inheritedMap
|
||||||
|
for (cf in cls.ctorFields + cls.classFields) {
|
||||||
|
target.getOrPut(cf.name) { mutableListOf() }.add(DocLookupUtils.toMemberVal(cf))
|
||||||
|
}
|
||||||
for (m in cls.members) target.getOrPut(m.name) { mutableListOf() }.add(m)
|
for (m in cls.members) target.getOrPut(m.name) { mutableListOf() }.add(m)
|
||||||
for (b in cls.bases) if (visited.add(b)) addMembersOf(b, false)
|
for (b in cls.bases) if (visited.add(b)) addMembersOf(b, false)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -96,6 +96,19 @@ object DocLookupUtils {
|
|||||||
return null
|
return null
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun findEnclosingClass(mini: MiniScript, offset: Int): MiniClassDecl? {
|
||||||
|
val src = mini.range.start.source
|
||||||
|
return mini.declarations.filterIsInstance<MiniClassDecl>()
|
||||||
|
.filter {
|
||||||
|
val start = src.offsetOf(it.range.start)
|
||||||
|
val end = src.offsetOf(it.range.end)
|
||||||
|
offset in start..end
|
||||||
|
}
|
||||||
|
.minByOrNull {
|
||||||
|
src.offsetOf(it.range.end) - src.offsetOf(it.range.start)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fun findTypeByRange(mini: MiniScript?, name: String, startOffset: Int, text: String? = null, imported: List<String>? = null): MiniTypeRef? {
|
fun findTypeByRange(mini: MiniScript?, name: String, startOffset: Int, text: String? = null, imported: List<String>? = null): MiniTypeRef? {
|
||||||
if (mini == null) return null
|
if (mini == null) return null
|
||||||
val src = mini.range.start.source
|
val src = mini.range.start.source
|
||||||
@@ -233,10 +246,14 @@ object DocLookupUtils {
|
|||||||
val rep = list.first()
|
val rep = list.first()
|
||||||
val bases = LinkedHashSet<String>()
|
val bases = LinkedHashSet<String>()
|
||||||
val members = LinkedHashMap<String, MutableList<MiniMemberDecl>>()
|
val members = LinkedHashMap<String, MutableList<MiniMemberDecl>>()
|
||||||
|
val ctorFields = LinkedHashMap<String, MiniCtorField>()
|
||||||
|
val classFields = LinkedHashMap<String, MiniCtorField>()
|
||||||
var doc: MiniDoc? = null
|
var doc: MiniDoc? = null
|
||||||
for (c in list) {
|
for (c in list) {
|
||||||
bases.addAll(c.bases)
|
bases.addAll(c.bases)
|
||||||
if (doc == null && c.doc != null && c.doc.raw.isNotBlank()) doc = c.doc
|
if (doc == null && c.doc != null && c.doc.raw.isNotBlank()) doc = c.doc
|
||||||
|
for (cf in c.ctorFields) ctorFields[cf.name] = cf
|
||||||
|
for (cf in c.classFields) classFields[cf.name] = cf
|
||||||
for (m in c.members) {
|
for (m in c.members) {
|
||||||
// Group by name to keep overloads together
|
// Group by name to keep overloads together
|
||||||
members.getOrPut(m.name) { mutableListOf() }.add(m)
|
members.getOrPut(m.name) { mutableListOf() }.add(m)
|
||||||
@@ -249,8 +266,8 @@ object DocLookupUtils {
|
|||||||
name = rep.name,
|
name = rep.name,
|
||||||
bases = bases.toList(),
|
bases = bases.toList(),
|
||||||
bodyRange = rep.bodyRange,
|
bodyRange = rep.bodyRange,
|
||||||
ctorFields = rep.ctorFields,
|
ctorFields = ctorFields.values.toList(),
|
||||||
classFields = rep.classFields,
|
classFields = classFields.values.toList(),
|
||||||
doc = doc,
|
doc = doc,
|
||||||
nameStart = rep.nameStart,
|
nameStart = rep.nameStart,
|
||||||
members = mergedMembers
|
members = mergedMembers
|
||||||
@@ -268,6 +285,18 @@ object DocLookupUtils {
|
|||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal fun toMemberVal(cf: MiniCtorField): MiniMemberValDecl = MiniMemberValDecl(
|
||||||
|
range = MiniRange(cf.nameStart, cf.nameStart),
|
||||||
|
name = cf.name,
|
||||||
|
mutable = cf.mutable,
|
||||||
|
type = cf.type,
|
||||||
|
initRange = null,
|
||||||
|
doc = null,
|
||||||
|
nameStart = cf.nameStart,
|
||||||
|
isStatic = false,
|
||||||
|
isExtern = false
|
||||||
|
)
|
||||||
|
|
||||||
fun resolveMemberWithInheritance(importedModules: List<String>, className: String, member: String, localMini: MiniScript? = null): Pair<String, MiniNamedDecl>? {
|
fun resolveMemberWithInheritance(importedModules: List<String>, className: String, member: String, localMini: MiniScript? = null): Pair<String, MiniNamedDecl>? {
|
||||||
val classes = aggregateClasses(importedModules, localMini)
|
val classes = aggregateClasses(importedModules, localMini)
|
||||||
fun dfs(name: String, visited: MutableSet<String>): Pair<String, MiniNamedDecl>? {
|
fun dfs(name: String, visited: MutableSet<String>): Pair<String, MiniNamedDecl>? {
|
||||||
@@ -275,6 +304,8 @@ object DocLookupUtils {
|
|||||||
val cls = classes[name]
|
val cls = classes[name]
|
||||||
if (cls != null) {
|
if (cls != null) {
|
||||||
cls.members.firstOrNull { it.name == member }?.let { return name to it }
|
cls.members.firstOrNull { it.name == member }?.let { return name to it }
|
||||||
|
cls.ctorFields.firstOrNull { it.name == member }?.let { return name to toMemberVal(it) }
|
||||||
|
cls.classFields.firstOrNull { it.name == member }?.let { return name to toMemberVal(it) }
|
||||||
for (baseName in cls.bases) {
|
for (baseName in cls.bases) {
|
||||||
dfs(baseName, visited)?.let { return it }
|
dfs(baseName, visited)?.let { return it }
|
||||||
}
|
}
|
||||||
@@ -656,6 +687,12 @@ object DocLookupUtils {
|
|||||||
val identRange = wordRangeAt(text, i + 1)
|
val identRange = wordRangeAt(text, i + 1)
|
||||||
if (identRange != null) {
|
if (identRange != null) {
|
||||||
val ident = text.substring(identRange.first, identRange.second)
|
val ident = text.substring(identRange.first, identRange.second)
|
||||||
|
|
||||||
|
// 3a) Handle plain "this"
|
||||||
|
if (ident == "this" && mini != null) {
|
||||||
|
findEnclosingClass(mini, identRange.first)?.let { return it.name }
|
||||||
|
}
|
||||||
|
|
||||||
// if it's "as Type", we want Type
|
// if it's "as Type", we want Type
|
||||||
var k = prevNonWs(text, identRange.first - 1)
|
var k = prevNonWs(text, identRange.first - 1)
|
||||||
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
if (k >= 1 && text[k] == 's' && text[k - 1] == 'a' && (k - 1 == 0 || !text[k - 2].isLetterOrDigit())) {
|
||||||
|
|||||||
@@ -39,7 +39,77 @@ data class MiniDoc(
|
|||||||
val raw: String,
|
val raw: String,
|
||||||
val summary: String?,
|
val summary: String?,
|
||||||
val tags: Map<String, List<String>> = emptyMap()
|
val tags: Map<String, List<String>> = emptyMap()
|
||||||
)
|
) {
|
||||||
|
companion object {
|
||||||
|
fun parse(range: MiniRange, lines: Iterable<String>, extraTags: Map<String, List<String>> = emptyMap()): MiniDoc {
|
||||||
|
val parsedTags = mutableMapOf<String, MutableList<String>>()
|
||||||
|
var currentTag: String? = null
|
||||||
|
val currentContent = mutableListOf<String>()
|
||||||
|
|
||||||
|
fun flush() {
|
||||||
|
currentTag?.let { tag ->
|
||||||
|
val trimmedContent = if (currentContent.size > 1) {
|
||||||
|
// First line is common content, we want to trim indent from subsequent lines
|
||||||
|
// based on THEIR common indent.
|
||||||
|
val firstLine = currentContent[0]
|
||||||
|
val remaining = currentContent.drop(1).joinToString("\n").trimIndent()
|
||||||
|
if (remaining.isEmpty()) firstLine else firstLine + "\n" + remaining
|
||||||
|
} else {
|
||||||
|
currentContent.joinToString("\n")
|
||||||
|
}
|
||||||
|
parsedTags.getOrPut(tag) { mutableListOf() }.add(trimmedContent.trim())
|
||||||
|
}
|
||||||
|
currentContent.clear()
|
||||||
|
}
|
||||||
|
|
||||||
|
val descriptionLines = mutableListOf<String>()
|
||||||
|
var inTags = false
|
||||||
|
|
||||||
|
for (rawLine in lines) {
|
||||||
|
for (line in rawLine.lines()) {
|
||||||
|
// Strip leading '*' and space if present (standard doc comment style)
|
||||||
|
val cleanedLine = line.trim().let {
|
||||||
|
if (it.startsWith("*")) it.substring(1).removePrefix(" ") else line
|
||||||
|
}
|
||||||
|
val trimmed = cleanedLine.trim()
|
||||||
|
if (trimmed.startsWith("@")) {
|
||||||
|
inTags = true
|
||||||
|
flush()
|
||||||
|
val parts = trimmed.substring(1).split(Regex("\\s+"), 2)
|
||||||
|
currentTag = parts[0]
|
||||||
|
val tagFirstLine = parts.getOrNull(1) ?: ""
|
||||||
|
if (tagFirstLine.isNotEmpty()) {
|
||||||
|
// Find where the content starts in the cleaned line to preserve relative indentation
|
||||||
|
val contentIndex = cleanedLine.indexOf(tagFirstLine)
|
||||||
|
if (contentIndex >= 0) {
|
||||||
|
currentContent.add(cleanedLine.substring(contentIndex))
|
||||||
|
} else {
|
||||||
|
currentContent.add(tagFirstLine)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (inTags) {
|
||||||
|
currentContent.add(cleanedLine)
|
||||||
|
} else {
|
||||||
|
descriptionLines.add(cleanedLine)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
flush()
|
||||||
|
|
||||||
|
val raw = descriptionLines.joinToString("\n").trimIndent().trim()
|
||||||
|
val summary = raw.lines().firstOrNull { it.isNotBlank() }?.trim()
|
||||||
|
|
||||||
|
val finalTags = parsedTags.toMutableMap()
|
||||||
|
extraTags.forEach { (k, v) ->
|
||||||
|
finalTags.getOrPut(k) { mutableListOf() }.addAll(v)
|
||||||
|
}
|
||||||
|
|
||||||
|
return MiniDoc(range, raw, summary, finalTags)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
sealed interface MiniNode { val range: MiniRange }
|
sealed interface MiniNode { val range: MiniRange }
|
||||||
|
|
||||||
@@ -156,6 +226,7 @@ data class MiniEnumDecl(
|
|||||||
override val nameStart: Pos,
|
override val nameStart: Pos,
|
||||||
override val isExtern: Boolean = false,
|
override val isExtern: Boolean = false,
|
||||||
override val isStatic: Boolean = false,
|
override val isStatic: Boolean = false,
|
||||||
|
val entryPositions: List<Pos> = emptyList()
|
||||||
) : MiniDecl
|
) : MiniDecl
|
||||||
|
|
||||||
data class MiniCtorField(
|
data class MiniCtorField(
|
||||||
|
|||||||
@@ -113,7 +113,7 @@ open class Obj {
|
|||||||
if (rec != null && !rec.isAbstract) {
|
if (rec != null && !rec.isAbstract) {
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
|
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
@@ -140,7 +140,7 @@ open class Obj {
|
|||||||
cls.members[name]?.let { rec ->
|
cls.members[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
|
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
@@ -429,10 +429,10 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Convert Lyng object to its Kotlin counterpart
|
* Convert a Lyng object to its Kotlin counterpart
|
||||||
*/
|
*/
|
||||||
open suspend fun toKotlin(scope: Scope): Any? {
|
open suspend fun toKotlin(scope: Scope): Any? {
|
||||||
return toString()
|
return toString(scope).value
|
||||||
}
|
}
|
||||||
|
|
||||||
fun willMutate(scope: Scope) {
|
fun willMutate(scope: Scope) {
|
||||||
@@ -482,7 +482,7 @@ open class Obj {
|
|||||||
cls.members[name]?.let { rec ->
|
cls.members[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: cls
|
val decl = rec.declaringClass ?: cls
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
|
||||||
val resolved = resolveRecord(scope, rec, name, decl)
|
val resolved = resolveRecord(scope, rec, name, decl)
|
||||||
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
if (resolved.type == ObjRecord.Type.Fun && resolved.value is Statement)
|
||||||
@@ -501,9 +501,8 @@ open class Obj {
|
|||||||
if (obj.type == ObjRecord.Type.Delegated) {
|
if (obj.type == ObjRecord.Type.Delegated) {
|
||||||
val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
val th = if (this === ObjVoid) ObjNull else this
|
val th = if (this === ObjVoid) ObjNull else this
|
||||||
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(th, ObjString(name)), onNotFoundResult = {
|
if (del.objClass.getInstanceMemberOrNull("getValue") == null) {
|
||||||
// If getValue not found, return a wrapper that calls invoke
|
val wrapper = object : Statement() {
|
||||||
object : Statement() {
|
|
||||||
override val pos: Pos = Pos.builtIn
|
override val pos: Pos = Pos.builtIn
|
||||||
override suspend fun execute(s: Scope): Obj {
|
override suspend fun execute(s: Scope): Obj {
|
||||||
val th2 = if (s.thisObj === ObjVoid) ObjNull else s.thisObj
|
val th2 = if (s.thisObj === ObjVoid) ObjNull else s.thisObj
|
||||||
@@ -511,7 +510,12 @@ open class Obj {
|
|||||||
return del.invokeInstanceMethod(s, "invoke", Arguments(*allArgs))
|
return del.invokeInstanceMethod(s, "invoke", Arguments(*allArgs))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
})
|
return obj.copy(
|
||||||
|
value = wrapper,
|
||||||
|
type = ObjRecord.Type.Other
|
||||||
|
)
|
||||||
|
}
|
||||||
|
val res = del.invokeInstanceMethod(scope, "getValue", Arguments(th, ObjString(name)))
|
||||||
return obj.copy(
|
return obj.copy(
|
||||||
value = res,
|
value = res,
|
||||||
type = ObjRecord.Type.Other
|
type = ObjRecord.Type.Other
|
||||||
@@ -526,7 +530,7 @@ open class Obj {
|
|||||||
}
|
}
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
// Check visibility for non-property members here if they weren't checked before
|
// Check visibility for non-property members here if they weren't checked before
|
||||||
if (!canAccessMember(obj.visibility, decl, caller))
|
if (!canAccessMember(obj.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
||||||
return obj
|
return obj
|
||||||
}
|
}
|
||||||
@@ -574,7 +578,7 @@ open class Obj {
|
|||||||
|
|
||||||
val decl = field.declaringClass
|
val decl = field.declaringClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(field.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(field.effectiveWriteVisibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't assign field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't assign field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
|
||||||
if (field.type == ObjRecord.Type.Delegated) {
|
if (field.type == ObjRecord.Type.Delegated) {
|
||||||
val del = field.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
val del = field.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
|
||||||
@@ -760,6 +764,38 @@ open class Obj {
|
|||||||
) {
|
) {
|
||||||
thisObj.toJson(this).toString().toObj()
|
thisObj.toJson(this).toString().toObj()
|
||||||
}
|
}
|
||||||
|
addFnDoc(
|
||||||
|
name = "clamp",
|
||||||
|
doc = "Clamps this value within the specified range. If the value is outside the range, it is set to the nearest boundary. Respects inclusive/exclusive range ends.",
|
||||||
|
params = listOf(ParamDoc("range")),
|
||||||
|
moduleName = "lyng.stdlib"
|
||||||
|
) {
|
||||||
|
val range = requiredArg<ObjRange>(0)
|
||||||
|
|
||||||
|
var result = thisObj
|
||||||
|
if (range.start != null && !range.start.isNull) {
|
||||||
|
if (result.compareTo(this, range.start) < 0) {
|
||||||
|
result = range.start
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (range.end != null && !range.end.isNull) {
|
||||||
|
val cmp = range.end.compareTo(this, result)
|
||||||
|
if (range.isEndInclusive) {
|
||||||
|
if (cmp < 0) result = range.end
|
||||||
|
} else {
|
||||||
|
if (cmp <= 0) {
|
||||||
|
if (range.end is ObjInt) {
|
||||||
|
result = ObjInt.of(range.end.value - 1)
|
||||||
|
} else if (range.end is ObjChar) {
|
||||||
|
result = ObjChar((range.end.value.code - 1).toChar())
|
||||||
|
} else {
|
||||||
|
result = range.end
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
result
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -17,16 +17,24 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import kotlinx.serialization.json.JsonElement
|
||||||
|
import kotlinx.serialization.json.JsonObject
|
||||||
import net.sergeych.lyng.*
|
import net.sergeych.lyng.*
|
||||||
import net.sergeych.lyng.miniast.*
|
import net.sergeych.lyng.miniast.*
|
||||||
import net.sergeych.lynon.LynonDecoder
|
import net.sergeych.lynon.LynonDecoder
|
||||||
|
import net.sergeych.lynon.LynonEncoder
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
// Simple id generator for class identities (not thread-safe; fine for scripts)
|
// Simple id generator for class identities (not thread-safe; fine for scripts)
|
||||||
private object ClassIdGen { var c: Long = 1L; fun nextId(): Long = c++ }
|
private object ClassIdGen { var c: Long = 1L; fun nextId(): Long = c++ }
|
||||||
|
|
||||||
val ObjClassType by lazy {
|
val ObjClassType by lazy {
|
||||||
ObjClass("Class").apply {
|
object : ObjClass("Class") {
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
val name = decoder.decodeObject(scope, ObjString.type, null) as ObjString
|
||||||
|
return scope.resolveQualifiedIdentifier(name.value)
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
addPropertyDoc(
|
addPropertyDoc(
|
||||||
name = "className",
|
name = "className",
|
||||||
doc = "Full name of this class including package if available.",
|
doc = "Full name of this class including package if available.",
|
||||||
@@ -106,8 +114,7 @@ open class ObjClass(
|
|||||||
val classId: Long = ClassIdGen.nextId()
|
val classId: Long = ClassIdGen.nextId()
|
||||||
var layoutVersion: Int = 0
|
var layoutVersion: Int = 0
|
||||||
|
|
||||||
private val mangledNameCache = mutableMapOf<String, String>()
|
fun mangledName(name: String): String = "$className::$name"
|
||||||
fun mangledName(name: String): String = mangledNameCache.getOrPut(name) { "$className::$name" }
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Map of public member names to their effective storage keys in instanceScope.objects.
|
* Map of public member names to their effective storage keys in instanceScope.objects.
|
||||||
@@ -120,7 +127,7 @@ open class ObjClass(
|
|||||||
if (cls.className == "Obj") continue
|
if (cls.className == "Obj") continue
|
||||||
for ((name, rec) in cls.members) {
|
for ((name, rec) in cls.members) {
|
||||||
if (rec.visibility == Visibility.Public) {
|
if (rec.visibility == Visibility.Public) {
|
||||||
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
val key = if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
res[name] = key
|
res[name] = key
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -259,6 +266,119 @@ open class ObjClass(
|
|||||||
*/
|
*/
|
||||||
internal val members = mutableMapOf<String, ObjRecord>()
|
internal val members = mutableMapOf<String, ObjRecord>()
|
||||||
|
|
||||||
|
internal data class FieldSlot(val slot: Int, val record: ObjRecord)
|
||||||
|
internal data class ResolvedMember(val record: ObjRecord, val declaringClass: ObjClass)
|
||||||
|
internal data class MethodSlot(val slot: Int, val record: ObjRecord)
|
||||||
|
private var fieldSlotLayoutVersion: Int = -1
|
||||||
|
private var fieldSlotMap: Map<String, FieldSlot> = emptyMap()
|
||||||
|
private var fieldSlotCount: Int = 0
|
||||||
|
private var instanceMemberLayoutVersion: Int = -1
|
||||||
|
private var instanceMemberCache: Map<String, ResolvedMember> = emptyMap()
|
||||||
|
private var methodSlotLayoutVersion: Int = -1
|
||||||
|
private var methodSlotMap: Map<String, MethodSlot> = emptyMap()
|
||||||
|
private var methodSlotCount: Int = 0
|
||||||
|
|
||||||
|
private fun ensureFieldSlots(): Map<String, FieldSlot> {
|
||||||
|
if (fieldSlotLayoutVersion == layoutVersion) return fieldSlotMap
|
||||||
|
val res = mutableMapOf<String, FieldSlot>()
|
||||||
|
var idx = 0
|
||||||
|
for (cls in mro) {
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (rec.type != ObjRecord.Type.Field && rec.type != ObjRecord.Type.ConstructorField) continue
|
||||||
|
val key = cls.mangledName(name)
|
||||||
|
if (res.containsKey(key)) continue
|
||||||
|
res[key] = FieldSlot(idx, rec)
|
||||||
|
idx += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
fieldSlotMap = res
|
||||||
|
fieldSlotCount = idx
|
||||||
|
fieldSlotLayoutVersion = layoutVersion
|
||||||
|
return fieldSlotMap
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ensureInstanceMemberCache(): Map<String, ResolvedMember> {
|
||||||
|
if (instanceMemberLayoutVersion == layoutVersion) return instanceMemberCache
|
||||||
|
val res = mutableMapOf<String, ResolvedMember>()
|
||||||
|
for (cls in mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (res.containsKey(name)) continue
|
||||||
|
val decl = rec.declaringClass ?: cls
|
||||||
|
res[name] = ResolvedMember(rec, decl)
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.isAbstract) return@forEach
|
||||||
|
if (res.containsKey(name)) return@forEach
|
||||||
|
val decl = rec.declaringClass ?: cls
|
||||||
|
res[name] = ResolvedMember(rec, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
instanceMemberCache = res
|
||||||
|
instanceMemberLayoutVersion = layoutVersion
|
||||||
|
return instanceMemberCache
|
||||||
|
}
|
||||||
|
|
||||||
|
private fun ensureMethodSlots(): Map<String, MethodSlot> {
|
||||||
|
if (methodSlotLayoutVersion == layoutVersion) return methodSlotMap
|
||||||
|
val res = mutableMapOf<String, MethodSlot>()
|
||||||
|
var idx = 0
|
||||||
|
for (cls in mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
for ((name, rec) in cls.members) {
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
if (rec.value !is Statement &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated &&
|
||||||
|
rec.type != ObjRecord.Type.Fun &&
|
||||||
|
rec.type != ObjRecord.Type.Property) {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
if (res.containsKey(key)) continue
|
||||||
|
res[key] = MethodSlot(idx, rec)
|
||||||
|
idx += 1
|
||||||
|
}
|
||||||
|
cls.classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.isAbstract) return@forEach
|
||||||
|
if (rec.value !is Statement &&
|
||||||
|
rec.type != ObjRecord.Type.Delegated &&
|
||||||
|
rec.type != ObjRecord.Type.Property) return@forEach
|
||||||
|
val key = if (rec.visibility == Visibility.Private || rec.type == ObjRecord.Type.Delegated) cls.mangledName(name) else name
|
||||||
|
if (res.containsKey(key)) return@forEach
|
||||||
|
res[key] = MethodSlot(idx, rec)
|
||||||
|
idx += 1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodSlotMap = res
|
||||||
|
methodSlotCount = idx
|
||||||
|
methodSlotLayoutVersion = layoutVersion
|
||||||
|
return methodSlotMap
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldSlotCount(): Int {
|
||||||
|
ensureFieldSlots()
|
||||||
|
return fieldSlotCount
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldSlotForKey(key: String): FieldSlot? {
|
||||||
|
ensureFieldSlots()
|
||||||
|
return fieldSlotMap[key]
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldSlotMap(): Map<String, FieldSlot> = ensureFieldSlots()
|
||||||
|
internal fun resolveInstanceMember(name: String): ResolvedMember? = ensureInstanceMemberCache()[name]
|
||||||
|
internal fun methodSlotCount(): Int {
|
||||||
|
ensureMethodSlots()
|
||||||
|
return methodSlotCount
|
||||||
|
}
|
||||||
|
internal fun methodSlotForKey(key: String): MethodSlot? {
|
||||||
|
ensureMethodSlots()
|
||||||
|
return methodSlotMap[key]
|
||||||
|
}
|
||||||
|
internal fun methodSlotMap(): Map<String, MethodSlot> = ensureMethodSlots()
|
||||||
|
|
||||||
override fun toString(): String = className
|
override fun toString(): String = className
|
||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int = if (other === this) 0 else -1
|
override suspend fun compareTo(scope: Scope, other: Obj): Int = if (other === this) 0 else -1
|
||||||
@@ -276,8 +396,8 @@ open class ObjClass(
|
|||||||
for (cls in mro) {
|
for (cls in mro) {
|
||||||
// 1) members-defined methods and fields
|
// 1) members-defined methods and fields
|
||||||
for ((k, v) in cls.members) {
|
for ((k, v) in cls.members) {
|
||||||
if (!v.isAbstract && (v.value is Statement || v.type == ObjRecord.Type.Delegated || v.type == ObjRecord.Type.Field)) {
|
if (!v.isAbstract && (v.value is Statement || v.type == ObjRecord.Type.Delegated || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.ConstructorField)) {
|
||||||
val key = if (v.visibility == Visibility.Private || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.Delegated) cls.mangledName(k) else k
|
val key = if (v.visibility == Visibility.Private || v.type == ObjRecord.Type.Field || v.type == ObjRecord.Type.ConstructorField || v.type == ObjRecord.Type.Delegated) cls.mangledName(k) else k
|
||||||
if (!res.containsKey(key)) {
|
if (!res.containsKey(key)) {
|
||||||
res[key] = v
|
res[key] = v
|
||||||
}
|
}
|
||||||
@@ -319,12 +439,47 @@ open class ObjClass(
|
|||||||
val stableParent = classScope ?: scope.parent
|
val stableParent = classScope ?: scope.parent
|
||||||
instance.instanceScope = Scope(stableParent, scope.args, scope.pos, instance)
|
instance.instanceScope = Scope(stableParent, scope.args, scope.pos, instance)
|
||||||
instance.instanceScope.currentClassCtx = null
|
instance.instanceScope.currentClassCtx = null
|
||||||
|
val fieldSlots = fieldSlotMap()
|
||||||
|
if (fieldSlots.isNotEmpty()) {
|
||||||
|
instance.initFieldSlots(fieldSlotCount())
|
||||||
|
}
|
||||||
|
val methodSlots = methodSlotMap()
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
instance.initMethodSlots(methodSlotCount())
|
||||||
|
}
|
||||||
// Expose instance methods (and other callable members) directly in the instance scope for fast lookup
|
// Expose instance methods (and other callable members) directly in the instance scope for fast lookup
|
||||||
// This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
|
// This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
|
||||||
|
|
||||||
instance.instanceScope.objects.putAll(templateMethods)
|
instance.instanceScope.objects.putAll(templateMethods)
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
for ((key, rec) in templateMethods) {
|
||||||
|
val slot = methodSlots[key]
|
||||||
|
if (slot != null) {
|
||||||
|
instance.setMethodSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
for (p in templateOthers) {
|
for (p in templateOthers) {
|
||||||
instance.instanceScope.objects[p.first] = p.second.copy()
|
val rec = p.second.copy()
|
||||||
|
instance.instanceScope.objects[p.first] = rec
|
||||||
|
val slot = fieldSlots[p.first]
|
||||||
|
if (slot != null) {
|
||||||
|
instance.setFieldSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
val mSlot = methodSlots[p.first]
|
||||||
|
if (mSlot != null) {
|
||||||
|
instance.setMethodSlotRecord(mSlot.slot, rec)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (methodSlots.isNotEmpty()) {
|
||||||
|
for ((_, mSlot) in methodSlots) {
|
||||||
|
val idx = mSlot.slot
|
||||||
|
if (idx >= 0 && idx < instance.methodSlots.size && instance.methodSlots[idx] == null) {
|
||||||
|
instance.setMethodSlotRecord(idx, mSlot.record)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return instance
|
return instance
|
||||||
}
|
}
|
||||||
@@ -409,6 +564,10 @@ open class ObjClass(
|
|||||||
if (rec != null) {
|
if (rec != null) {
|
||||||
val mangled = c.mangledName(p.name)
|
val mangled = c.mangledName(p.name)
|
||||||
instance.instanceScope.objects[mangled] = rec
|
instance.instanceScope.objects[mangled] = rec
|
||||||
|
val slot = instance.objClass.fieldSlotForKey(mangled)
|
||||||
|
if (slot != null) {
|
||||||
|
instance.setFieldSlotRecord(slot.slot, rec)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -451,6 +610,7 @@ open class ObjClass(
|
|||||||
isAbstract: Boolean = false,
|
isAbstract: Boolean = false,
|
||||||
isClosed: Boolean = false,
|
isClosed: Boolean = false,
|
||||||
isOverride: Boolean = false,
|
isOverride: Boolean = false,
|
||||||
|
isTransient: Boolean = false,
|
||||||
type: ObjRecord.Type = ObjRecord.Type.Field,
|
type: ObjRecord.Type = ObjRecord.Type.Field,
|
||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
// Validation of override rules: only for non-system declarations
|
// Validation of override rules: only for non-system declarations
|
||||||
@@ -461,7 +621,7 @@ open class ObjClass(
|
|||||||
if (existing != null && existing.declaringClass != this) {
|
if (existing != null && existing.declaringClass != this) {
|
||||||
// If the existing member is private in the ancestor, it's not visible for overriding.
|
// If the existing member is private in the ancestor, it's not visible for overriding.
|
||||||
// It should be treated as a new member in this class.
|
// It should be treated as a new member in this class.
|
||||||
if (!existing.visibility.isPublic && !canAccessMember(existing.visibility, existing.declaringClass, this)) {
|
if (!existing.visibility.isPublic && !canAccessMember(existing.visibility, existing.declaringClass, this, name)) {
|
||||||
// It's effectively not there for us, so actualOverride remains false
|
// It's effectively not there for us, so actualOverride remains false
|
||||||
} else {
|
} else {
|
||||||
actualOverride = true
|
actualOverride = true
|
||||||
@@ -494,6 +654,7 @@ open class ObjClass(
|
|||||||
isAbstract = isAbstract,
|
isAbstract = isAbstract,
|
||||||
isClosed = isClosed,
|
isClosed = isClosed,
|
||||||
isOverride = isOverride,
|
isOverride = isOverride,
|
||||||
|
isTransient = isTransient,
|
||||||
type = type
|
type = type
|
||||||
)
|
)
|
||||||
members[name] = rec
|
members[name] = rec
|
||||||
@@ -514,13 +675,14 @@ open class ObjClass(
|
|||||||
visibility: Visibility = Visibility.Public,
|
visibility: Visibility = Visibility.Public,
|
||||||
writeVisibility: Visibility? = null,
|
writeVisibility: Visibility? = null,
|
||||||
pos: Pos = Pos.builtIn,
|
pos: Pos = Pos.builtIn,
|
||||||
|
isTransient: Boolean = false,
|
||||||
type: ObjRecord.Type = ObjRecord.Type.Field
|
type: ObjRecord.Type = ObjRecord.Type.Field
|
||||||
): ObjRecord {
|
): ObjRecord {
|
||||||
initClassScope()
|
initClassScope()
|
||||||
val existing = classScope!!.objects[name]
|
val existing = classScope!!.objects[name]
|
||||||
if (existing != null)
|
if (existing != null)
|
||||||
throw ScriptError(pos, "$name is already defined in $objClass or one of its supertypes")
|
throw ScriptError(pos, "$name is already defined in $objClass or one of its supertypes")
|
||||||
val rec = classScope!!.addItem(name, isMutable, initialValue, visibility, writeVisibility, recordType = type)
|
val rec = classScope!!.addItem(name, isMutable, initialValue, visibility, writeVisibility, recordType = type, isTransient = isTransient)
|
||||||
// Structural change: bump layout version for PIC invalidation
|
// Structural change: bump layout version for PIC invalidation
|
||||||
layoutVersion += 1
|
layoutVersion += 1
|
||||||
return rec
|
return rec
|
||||||
@@ -707,9 +869,23 @@ open class ObjClass(
|
|||||||
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
if (isAnonymous) scope.raiseError("Cannot serialize anonymous class")
|
||||||
|
encoder.encodeObject(scope, classNameObj, ObjString.type.lynonType())
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toJson(scope: Scope): JsonElement {
|
||||||
|
val result = mutableMapOf<String, JsonElement>()
|
||||||
|
result["__class_name"] = classNameObj.toJson(scope)
|
||||||
|
classScope?.objects?.forEach { (name, rec) ->
|
||||||
|
if (rec.type.serializable && rec.visibility.isPublic && !rec.isTransient) {
|
||||||
|
result[name] = rec.value.toJson(scope)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return JsonObject(result)
|
||||||
|
}
|
||||||
|
|
||||||
open suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj =
|
open suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj =
|
||||||
scope.raiseNotImplemented()
|
scope.raiseNotImplemented()
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@@ -0,0 +1,293 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import kotlinx.datetime.*
|
||||||
|
import kotlinx.serialization.json.JsonElement
|
||||||
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
|
import net.sergeych.lyng.Scope
|
||||||
|
import net.sergeych.lyng.Statement
|
||||||
|
import net.sergeych.lyng.miniast.addClassFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addFnDoc
|
||||||
|
import net.sergeych.lyng.miniast.addPropertyDoc
|
||||||
|
import net.sergeych.lyng.miniast.type
|
||||||
|
import net.sergeych.lynon.LynonDecoder
|
||||||
|
import net.sergeych.lynon.LynonEncoder
|
||||||
|
import net.sergeych.lynon.LynonType
|
||||||
|
|
||||||
|
class ObjDateTime(val instant: Instant, val timeZone: TimeZone) : Obj() {
|
||||||
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
|
val localDateTime: LocalDateTime by lazy {
|
||||||
|
instant.toLocalDateTime(timeZone)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toString(): String {
|
||||||
|
return localDateTime.toString() + timeZone.toString()
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
|
for (cls in objClass.mro) {
|
||||||
|
val rec = cls.members[name]
|
||||||
|
if (rec != null) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
val prop = rec.value as? ObjProperty
|
||||||
|
?: (rec.value as? Statement)?.execute(scope) as? ObjProperty
|
||||||
|
if (prop != null) {
|
||||||
|
return ObjRecord(prop.callGetter(scope, this, rec.declaringClass ?: cls), rec.isMutable)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (rec.type == ObjRecord.Type.Fun || rec.value is Statement) {
|
||||||
|
val s = rec.value as Statement
|
||||||
|
return ObjRecord(net.sergeych.lyng.statement { s.execute(this.createChildScope(newThisObj = this@ObjDateTime)) }, rec.isMutable)
|
||||||
|
}
|
||||||
|
return resolveRecord(scope, rec, name, rec.declaringClass ?: cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return super.readField(scope, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun plus(scope: Scope, other: Obj): Obj {
|
||||||
|
return when (other) {
|
||||||
|
is ObjDuration -> ObjDateTime(instant + other.duration, timeZone)
|
||||||
|
else -> super.plus(scope, other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun minus(scope: Scope, other: Obj): Obj {
|
||||||
|
return when (other) {
|
||||||
|
is ObjDuration -> ObjDateTime(instant - other.duration, timeZone)
|
||||||
|
is ObjDateTime -> ObjDuration(instant - other.instant)
|
||||||
|
is ObjInstant -> ObjDuration(instant - other.instant)
|
||||||
|
else -> super.minus(scope, other)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
if (other is ObjDateTime) {
|
||||||
|
return instant.compareTo(other.instant)
|
||||||
|
}
|
||||||
|
if (other is ObjInstant) {
|
||||||
|
return instant.compareTo(other.instant)
|
||||||
|
}
|
||||||
|
return super.compareTo(scope, other)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toKotlin(scope: Scope): Any {
|
||||||
|
return localDateTime
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun hashCode(): Int {
|
||||||
|
return instant.hashCode() xor timeZone.hashCode()
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun equals(other: Any?): Boolean {
|
||||||
|
if (this === other) return true
|
||||||
|
if (other !is ObjDateTime) return false
|
||||||
|
return instant == other.instant && timeZone == other.timeZone
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun lynonType(): LynonType = LynonType.Other
|
||||||
|
|
||||||
|
override suspend fun serialize(scope: Scope, encoder: LynonEncoder, lynonType: LynonType?) {
|
||||||
|
encoder.encodeCached(this) {
|
||||||
|
encodeAny(scope, ObjInstant(instant))
|
||||||
|
encodeCached(timeZone.id) {
|
||||||
|
encodeBinaryData(timeZone.id.encodeToByteArray())
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun toJson(scope: Scope): JsonElement = JsonPrimitive(toRFC3339())
|
||||||
|
|
||||||
|
fun toRFC3339(): String {
|
||||||
|
val s = localDateTime.toString()
|
||||||
|
val tz = if (timeZone == TimeZone.UTC) "Z" else timeZone.id
|
||||||
|
return if (tz.startsWith("+") || tz.startsWith("-") || tz == "Z") s + tz else s + "[" + tz + "]"
|
||||||
|
}
|
||||||
|
|
||||||
|
companion object {
|
||||||
|
val type = object : ObjClass("DateTime") {
|
||||||
|
override suspend fun callOn(scope: Scope): Obj {
|
||||||
|
val args = scope.args
|
||||||
|
return when (val a0 = args.list.getOrNull(0)) {
|
||||||
|
is ObjInstant -> {
|
||||||
|
val tz = when (val a1 = args.list.getOrNull(1)) {
|
||||||
|
null -> TimeZone.currentSystemDefault()
|
||||||
|
is ObjString -> TimeZone.of(a1.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a1.value.toInt()).asTimeZone()
|
||||||
|
else -> scope.raiseIllegalArgument("invalid timezone: $a1")
|
||||||
|
}
|
||||||
|
ObjDateTime(a0.instant, tz)
|
||||||
|
}
|
||||||
|
|
||||||
|
is ObjInt -> {
|
||||||
|
// DateTime(year, month, day, hour=0, minute=0, second=0, timeZone="UTC")
|
||||||
|
val year = a0.value.toInt()
|
||||||
|
val month = args.list.getOrNull(1)?.toInt() ?: scope.raiseIllegalArgument("month is required")
|
||||||
|
val day = args.list.getOrNull(2)?.toInt() ?: scope.raiseIllegalArgument("day is required")
|
||||||
|
val hour = args.list.getOrNull(3)?.toInt() ?: 0
|
||||||
|
val minute = args.list.getOrNull(4)?.toInt() ?: 0
|
||||||
|
val second = args.list.getOrNull(5)?.toInt() ?: 0
|
||||||
|
val tz = when (val a6 = args.list.getOrNull(6)) {
|
||||||
|
null -> TimeZone.UTC
|
||||||
|
is ObjString -> TimeZone.of(a6.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a6.value.toInt()).asTimeZone()
|
||||||
|
else -> scope.raiseIllegalArgument("invalid timezone: $a6")
|
||||||
|
}
|
||||||
|
val ldt = LocalDateTime(year, month, day, hour, minute, second)
|
||||||
|
ObjDateTime(ldt.toInstant(tz), tz)
|
||||||
|
}
|
||||||
|
|
||||||
|
is ObjString -> {
|
||||||
|
val instant = Instant.parse(a0.value)
|
||||||
|
ObjDateTime(instant, TimeZone.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
else -> scope.raiseIllegalArgument("can't construct DateTime from ${args.inspect(scope)}")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
|
return decoder.decodeCached {
|
||||||
|
val instant = (decoder.decodeAny(scope) as ObjInstant).instant
|
||||||
|
val tzId = decoder.decodeCached { decoder.unpackBinaryData().decodeToString() }
|
||||||
|
ObjDateTime(instant, TimeZone.of(tzId))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}.apply {
|
||||||
|
addPropertyDoc("year", "The year component.", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.year.toObj() })
|
||||||
|
addPropertyDoc("month", "The month component (1..12).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.monthNumber.toObj() })
|
||||||
|
addPropertyDoc("dayOfMonth", "The day of month component.", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.dayOfMonth.toObj() })
|
||||||
|
addPropertyDoc("day", "Alias to dayOfMonth.", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.dayOfMonth.toObj() })
|
||||||
|
addPropertyDoc("hour", "The hour component (0..23).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.hour.toObj() })
|
||||||
|
addPropertyDoc("minute", "The minute component (0..59).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.minute.toObj() })
|
||||||
|
addPropertyDoc("second", "The second component (0..59).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.second.toObj() })
|
||||||
|
addPropertyDoc("dayOfWeek", "The day of week (1=Monday, 7=Sunday).", type("lyng.Int"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().localDateTime.dayOfWeek.isoDayNumber.toObj() })
|
||||||
|
addPropertyDoc("timeZone", "The time zone ID (e.g. 'Z', '+02:00', 'Europe/Prague').", type("lyng.String"), moduleName = "lyng.time",
|
||||||
|
getter = { thisAs<ObjDateTime>().timeZone.id.toObj() })
|
||||||
|
|
||||||
|
addFnDoc("toInstant", "Convert this localized date time back to an absolute Instant.", returns = type("lyng.Instant"), moduleName = "lyng.time") {
|
||||||
|
ObjInstant(thisAs<ObjDateTime>().instant)
|
||||||
|
}
|
||||||
|
addFnDoc("toEpochSeconds", "Return the number of full seconds since the Unix epoch (UTC).", returns = type("lyng.Int"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().instant.epochSeconds.toObj()
|
||||||
|
}
|
||||||
|
addFnDoc("toRFC3339", "Return the RFC3339 string representation of this date time, including its timezone offset.", returns = type("lyng.String"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().toRFC3339().toObj()
|
||||||
|
}
|
||||||
|
addFnDoc("toSortableString", "Alias to toRFC3339.", returns = type("lyng.String"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().toRFC3339().toObj()
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc("toEpochMilliseconds", "Return the number of milliseconds since the Unix epoch (UTC).", returns = type("lyng.Int"), moduleName = "lyng.time") {
|
||||||
|
thisAs<ObjDateTime>().instant.toEpochMilliseconds().toObj()
|
||||||
|
}
|
||||||
|
addFnDoc("toTimeZone", "Return a new DateTime representing the same instant but in a different time zone. " +
|
||||||
|
"Accepts a timezone ID string (e.g., 'UTC', '+02:00') or an integer offset in seconds.",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("tz", type = type("lyng.Any"))),
|
||||||
|
returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
val tz = when (val a = args.list.getOrNull(0)) {
|
||||||
|
is ObjString -> TimeZone.of(a.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a.value.toInt()).asTimeZone()
|
||||||
|
else -> raiseIllegalArgument("invalid timezone: $a")
|
||||||
|
}
|
||||||
|
ObjDateTime(thisAs<ObjDateTime>().instant, tz)
|
||||||
|
}
|
||||||
|
addFnDoc("toUTC", "Shortcut to convert this date time to the UTC time zone.", returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
ObjDateTime(thisAs<ObjDateTime>().instant, TimeZone.UTC)
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc("addMonths", "Return a new DateTime with the specified number of months added (or subtracted if negative). " +
|
||||||
|
"Normalizes the day of month if necessary (e.g., Jan 31 + 1 month = Feb 28/29).",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("months", type = type("lyng.Int"))),
|
||||||
|
returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
val n = args.list.getOrNull(0)?.toInt() ?: 0
|
||||||
|
val res = thisAs<ObjDateTime>().instant.plus(n, DateTimeUnit.MONTH, thisAs<ObjDateTime>().timeZone)
|
||||||
|
ObjDateTime(res, thisAs<ObjDateTime>().timeZone)
|
||||||
|
}
|
||||||
|
addFnDoc("addYears", "Return a new DateTime with the specified number of years added (or subtracted if negative).",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("years", type = type("lyng.Int"))),
|
||||||
|
returns = type("lyng.DateTime"), moduleName = "lyng.time") {
|
||||||
|
val n = args.list.getOrNull(0)?.toInt() ?: 0
|
||||||
|
val res = thisAs<ObjDateTime>().instant.plus(n, DateTimeUnit.YEAR, thisAs<ObjDateTime>().timeZone)
|
||||||
|
ObjDateTime(res, thisAs<ObjDateTime>().timeZone)
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFn("now") {
|
||||||
|
val tz = when (val a = args.list.getOrNull(0)) {
|
||||||
|
null -> TimeZone.currentSystemDefault()
|
||||||
|
is ObjString -> TimeZone.of(a.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a.value.toInt()).asTimeZone()
|
||||||
|
else -> raiseIllegalArgument("invalid timezone: $a")
|
||||||
|
}
|
||||||
|
ObjDateTime(kotlin.time.Clock.System.now(), tz)
|
||||||
|
}
|
||||||
|
|
||||||
|
addClassFnDoc("parseRFC3339",
|
||||||
|
"Parse an RFC3339 string into a DateTime object. " +
|
||||||
|
"Note: if the string does not specify a timezone, UTC is assumed.",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("string", type = type("lyng.String"))),
|
||||||
|
returns = type("lyng.DateTime"),
|
||||||
|
moduleName = "lyng.time") {
|
||||||
|
val s = (args.firstAndOnly() as ObjString).value
|
||||||
|
// kotlinx-datetime's Instant.parse handles RFC3339
|
||||||
|
// But we want to preserve the offset if present for DateTime.
|
||||||
|
// However, Instant.parse("...") always gives an Instant.
|
||||||
|
// If we want the specific offset from the string, we might need a more complex parse.
|
||||||
|
// For now, let's stick to parsing it as Instant and converting to UTC or specified TZ.
|
||||||
|
// Actually, if the string has an offset, Instant.parse handles it but returns UTC instant.
|
||||||
|
|
||||||
|
// Let's try to detect if there is an offset in the string.
|
||||||
|
// If not, use UTC.
|
||||||
|
val instant = Instant.parse(s)
|
||||||
|
|
||||||
|
// RFC3339 can have Z or +/-HH:mm or +/-HHmm or +/-HH
|
||||||
|
val tz = try {
|
||||||
|
if (s.endsWith("Z", ignoreCase = true)) {
|
||||||
|
TimeZone.of("Z")
|
||||||
|
} else {
|
||||||
|
// Look for the last + or - which is likely the start of the offset
|
||||||
|
val lastPlus = s.lastIndexOf('+')
|
||||||
|
val lastMinus = s.lastIndexOf('-')
|
||||||
|
val offsetStart = if (lastPlus > lastMinus) lastPlus else lastMinus
|
||||||
|
if (offsetStart > s.lastIndexOf('T')) {
|
||||||
|
// Likely an offset
|
||||||
|
val offsetStr = s.substring(offsetStart)
|
||||||
|
TimeZone.of(offsetStr)
|
||||||
|
} else {
|
||||||
|
TimeZone.UTC
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} catch (e: Exception) {
|
||||||
|
TimeZone.UTC
|
||||||
|
}
|
||||||
|
|
||||||
|
ObjDateTime(instant, tz)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -76,6 +76,7 @@ open class ObjException(
|
|||||||
append("\n\tat ${t.toString(scope)}")
|
append("\n\tat ${t.toString(scope)}")
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override suspend fun defaultToString(scope: Scope): ObjString {
|
override suspend fun defaultToString(scope: Scope): ObjString {
|
||||||
val at = getStackTrace().list.firstOrNull()?.toString(scope)
|
val at = getStackTrace().list.firstOrNull()?.toString(scope)
|
||||||
?: ObjString("(unknown)")
|
?: ObjString("(unknown)")
|
||||||
@@ -100,6 +101,7 @@ open class ObjException(
|
|||||||
while (s != null) {
|
while (s != null) {
|
||||||
val pos = s.pos
|
val pos = s.pos
|
||||||
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
if (pos != lastPos && !pos.currentLine.isEmpty()) {
|
||||||
|
if( (lastPos == null || (lastPos.source != pos.source || lastPos.line != pos.line)) ) {
|
||||||
if (maybeCls != null) {
|
if (maybeCls != null) {
|
||||||
result.list += maybeCls.callWithArgs(
|
result.list += maybeCls.callWithArgs(
|
||||||
scope,
|
scope,
|
||||||
@@ -110,11 +112,12 @@ open class ObjException(
|
|||||||
)
|
)
|
||||||
} else {
|
} else {
|
||||||
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
// Fallback textual entry if StackTraceEntry class is not available in this scope
|
||||||
result.list += ObjString("${pos.source.objSourceName}:${pos.line}:${pos.column}: ${pos.currentLine}")
|
result.list += ObjString("#${pos.source.objSourceName}:${pos.line+1}:${pos.column+1}: ${pos.currentLine}")
|
||||||
|
}
|
||||||
|
lastPos = pos
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
s = s.parent
|
s = s.parent
|
||||||
lastPos = pos
|
|
||||||
}
|
}
|
||||||
return result
|
return result
|
||||||
}
|
}
|
||||||
@@ -356,18 +359,18 @@ suspend fun Obj.getLyngExceptionMessage(scope: Scope?=null): String {
|
|||||||
* The stack trace details each frame using indentation for clarity.
|
* The stack trace details each frame using indentation for clarity.
|
||||||
* @throws IllegalArgumentException if the object is not a Lyng exception.
|
* @throws IllegalArgumentException if the object is not a Lyng exception.
|
||||||
*/
|
*/
|
||||||
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope?=null): String {
|
suspend fun Obj.getLyngExceptionMessageWithStackTrace(scope: Scope? = null,showDetails:Boolean=true): String {
|
||||||
require(this.isLyngException())
|
require(this.isLyngException())
|
||||||
val s = scope ?: Script.newScope()
|
val s = scope ?: Script.newScope()
|
||||||
val msg = getLyngExceptionMessage(s)
|
val msg = getLyngExceptionMessage(s)
|
||||||
val trace = getLyngExceptionStackTrace(s)
|
val trace = getLyngExceptionStackTrace(s)
|
||||||
var at = "unknown"
|
var at = "unknown"
|
||||||
|
// var firstLine = true
|
||||||
val stack = if (!trace.list.isEmpty()) {
|
val stack = if (!trace.list.isEmpty()) {
|
||||||
val first = trace.list[0]
|
val first = trace.list[0]
|
||||||
at = (first.readField(s, "at").value as ObjString).value
|
at = (first.readField(s, "at").value as ObjString).value
|
||||||
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
"\n" + trace.list.map { " at " + it.toString(s).value }.joinToString("\n")
|
||||||
}
|
} else ""
|
||||||
else ""
|
|
||||||
return "$at: $msg$stack"
|
return "$at: $msg$stack"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -30,6 +30,36 @@ import net.sergeych.lynon.LynonType
|
|||||||
class ObjInstance(override val objClass: ObjClass) : Obj() {
|
class ObjInstance(override val objClass: ObjClass) : Obj() {
|
||||||
|
|
||||||
internal lateinit var instanceScope: Scope
|
internal lateinit var instanceScope: Scope
|
||||||
|
internal var fieldSlots: Array<ObjRecord?> = emptyArray()
|
||||||
|
internal var methodSlots: Array<ObjRecord?> = emptyArray()
|
||||||
|
|
||||||
|
internal fun initFieldSlots(size: Int) {
|
||||||
|
fieldSlots = arrayOfNulls(size)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun setFieldSlotRecord(slot: Int, rec: ObjRecord) {
|
||||||
|
if (slot >= 0 && slot < fieldSlots.size) fieldSlots[slot] = rec
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun initMethodSlots(size: Int) {
|
||||||
|
methodSlots = arrayOfNulls(size)
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun setMethodSlotRecord(slot: Int, rec: ObjRecord) {
|
||||||
|
if (slot >= 0 && slot < methodSlots.size) methodSlots[slot] = rec
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun fieldRecordForKey(key: String): ObjRecord? {
|
||||||
|
val slot = objClass.fieldSlotForKey(key) ?: return null
|
||||||
|
val idx = slot.slot
|
||||||
|
return if (idx >= 0 && idx < fieldSlots.size) fieldSlots[idx] else null
|
||||||
|
}
|
||||||
|
|
||||||
|
internal fun methodRecordForKey(key: String): ObjRecord? {
|
||||||
|
val slot = objClass.methodSlotForKey(key) ?: return null
|
||||||
|
val idx = slot.slot
|
||||||
|
return if (idx >= 0 && idx < methodSlots.size) methodSlots[idx] else null
|
||||||
|
}
|
||||||
|
|
||||||
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
@@ -37,6 +67,16 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// Fast path for public members when outside any class context
|
// Fast path for public members when outside any class context
|
||||||
if (caller == null) {
|
if (caller == null) {
|
||||||
objClass.publicMemberResolution[name]?.let { key ->
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name) ?: objClass
|
||||||
|
return resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[key]?.let { rec ->
|
instanceScope.objects[key]?.let { rec ->
|
||||||
// Directly return fields to bypass resolveRecord overhead
|
// Directly return fields to bypass resolveRecord overhead
|
||||||
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
@@ -56,6 +96,16 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
// Check for private fields (stored in instanceScope)
|
// Check for private fields (stored in instanceScope)
|
||||||
val mangled = c.mangledName(name)
|
val mangled = c.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Private) {
|
if (rec.visibility == Visibility.Private) {
|
||||||
return resolveRecord(scope, rec, name, c)
|
return resolveRecord(scope, rec, name, c)
|
||||||
@@ -67,8 +117,18 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val mangled = cls.mangledName(name)
|
val mangled = cls.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.visibility, cls, caller, name)) {
|
||||||
|
return resolveRecord(scope, rec, name, cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.visibility, cls, caller, name)) {
|
||||||
|
return resolveRecord(scope, rec, name, cls)
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.visibility, cls, caller)) {
|
if (canAccessMember(rec.visibility, cls, caller, name)) {
|
||||||
return resolveRecord(scope, rec, name, cls)
|
return resolveRecord(scope, rec, name, cls)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -77,8 +137,13 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// 2. Unmangled storage
|
// 2. Unmangled storage
|
||||||
instanceScope.objects[name]?.let { rec ->
|
instanceScope.objects[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
// Unmangled access is only allowed if it's public OR we are inside the same instance's method
|
if (canAccessMember(rec.visibility, decl, caller, name)) {
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.visibility, decl, caller)) {
|
return resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(name)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.visibility, decl, caller, name)) {
|
||||||
return resolveRecord(scope, rec, name, decl)
|
return resolveRecord(scope, rec, name, decl)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -110,10 +175,15 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
val d = decl ?: obj.declaringClass
|
val d = decl ?: obj.declaringClass
|
||||||
if (d != null) {
|
if (d != null) {
|
||||||
val mangled = d.mangledName(name)
|
val mangled = d.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let {
|
||||||
|
targetRec = it
|
||||||
|
}
|
||||||
|
if (targetRec === obj) {
|
||||||
instanceScope.objects[mangled]?.let {
|
instanceScope.objects[mangled]?.let {
|
||||||
targetRec = it
|
targetRec = it
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (targetRec === obj) {
|
if (targetRec === obj) {
|
||||||
instanceScope.objects[name]?.let { rec ->
|
instanceScope.objects[name]?.let { rec ->
|
||||||
// Check if this record in instanceScope is the one we want.
|
// Check if this record in instanceScope is the one we want.
|
||||||
@@ -135,10 +205,29 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// Fast path for public members when outside any class context
|
// Fast path for public members when outside any class context
|
||||||
if (caller == null) {
|
if (caller == null) {
|
||||||
objClass.publicMemberResolution[name]?.let { key ->
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
||||||
|
// Skip property/delegated overhead if it's a plain mutable field
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && rec.isMutable && !rec.isAbstract) {
|
||||||
|
if (rec.value.assign(scope, newValue) == null)
|
||||||
|
rec.value = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
|
updateRecord(scope, rec, name, newValue, rec.declaringClass)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, rec.declaringClass)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[key]?.let { rec ->
|
instanceScope.objects[key]?.let { rec ->
|
||||||
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
if (rec.effectiveWriteVisibility == Visibility.Public) {
|
||||||
// Skip property/delegated overhead if it's a plain mutable field
|
// Skip property/delegated overhead if it's a plain mutable field
|
||||||
if (rec.type == ObjRecord.Type.Field && rec.isMutable && !rec.isAbstract) {
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && rec.isMutable && !rec.isAbstract) {
|
||||||
if (rec.value.assign(scope, newValue) == null)
|
if (rec.value.assign(scope, newValue) == null)
|
||||||
rec.value = newValue
|
rec.value = newValue
|
||||||
return
|
return
|
||||||
@@ -161,6 +250,19 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
// Check for private fields (stored in instanceScope)
|
// Check for private fields (stored in instanceScope)
|
||||||
val mangled = c.mangledName(name)
|
val mangled = c.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Private) {
|
if (rec.visibility == Visibility.Private) {
|
||||||
updateRecord(scope, rec, name, newValue, c)
|
updateRecord(scope, rec, name, newValue, c)
|
||||||
@@ -173,8 +275,21 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
for (cls in objClass.mro) {
|
for (cls in objClass.mro) {
|
||||||
if (cls.className == "Obj") break
|
if (cls.className == "Obj") break
|
||||||
val mangled = cls.mangledName(name)
|
val mangled = cls.mangledName(name)
|
||||||
|
fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, cls, caller, name)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, cls, caller, name) &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.effectiveWriteVisibility, cls, caller)) {
|
if (canAccessMember(rec.effectiveWriteVisibility, cls, caller, name)) {
|
||||||
updateRecord(scope, rec, name, newValue, cls)
|
updateRecord(scope, rec, name, newValue, cls)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -184,7 +299,15 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// 2. Unmangled storage
|
// 2. Unmangled storage
|
||||||
instanceScope.objects[name]?.let { rec ->
|
instanceScope.objects[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
if ((scope.thisObj === this && caller != null) || canAccessMember(rec.effectiveWriteVisibility, decl, caller)) {
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name)) {
|
||||||
|
updateRecord(scope, rec, name, newValue, decl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
methodRecordForKey(name)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name) &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
updateRecord(scope, rec, name, newValue, decl)
|
updateRecord(scope, rec, name, newValue, decl)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -226,6 +349,16 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// Fast path for public members when outside any class context
|
// Fast path for public members when outside any class context
|
||||||
if (caller == null) {
|
if (caller == null) {
|
||||||
objClass.publicMemberResolution[name]?.let { key ->
|
objClass.publicMemberResolution[name]?.let { key ->
|
||||||
|
methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[key]?.let { rec ->
|
instanceScope.objects[key]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
if (rec.visibility == Visibility.Public && !rec.isAbstract) {
|
||||||
val decl = rec.declaringClass
|
val decl = rec.declaringClass
|
||||||
@@ -242,6 +375,15 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// 0. Prefer private member of current class context
|
// 0. Prefer private member of current class context
|
||||||
caller?.let { c ->
|
caller?.let { c ->
|
||||||
val mangled = c.mangledName(name)
|
val mangled = c.mangledName(name)
|
||||||
|
methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (args.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, this, c)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
instanceScope.objects[mangled]?.let { rec ->
|
instanceScope.objects[mangled]?.let { rec ->
|
||||||
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
if (rec.type == ObjRecord.Type.Property) {
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
@@ -262,13 +404,23 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. Walk MRO to find member, handling delegation
|
// Fast path for non-delegated instance methods in class context
|
||||||
for (cls in objClass.mro) {
|
methodRecordForKey(name)?.let { rec ->
|
||||||
if (cls.className == "Obj") break
|
if (!rec.isAbstract && rec.type == ObjRecord.Type.Fun) {
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
val decl = rec.declaringClass ?: objClass.findDeclaringClassOf(name) ?: objClass
|
||||||
if (rec != null && !rec.isAbstract) {
|
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
||||||
|
if (canAccessMember(rec.visibility, decl, effectiveCaller, name)) {
|
||||||
|
return rec.value.invoke(instanceScope, this, args, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Resolve instance member via cached MRO lookup, handling delegation
|
||||||
|
objClass.resolveInstanceMember(name)?.let { resolvedMember ->
|
||||||
|
val rec = resolvedMember.record
|
||||||
|
val decl = resolvedMember.declaringClass
|
||||||
if (rec.type == ObjRecord.Type.Delegated) {
|
if (rec.type == ObjRecord.Type.Delegated) {
|
||||||
val storageName = cls.mangledName(name)
|
val storageName = decl.mangledName(name)
|
||||||
val del = instanceScope[storageName]?.delegate ?: rec.delegate
|
val del = instanceScope[storageName]?.delegate ?: rec.delegate
|
||||||
?: scope.raiseError("Internal error: delegated member $name has no delegate (tried $storageName)")
|
?: scope.raiseError("Internal error: delegated member $name has no delegate (tried $storageName)")
|
||||||
|
|
||||||
@@ -277,12 +429,11 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs), onNotFoundResult = {
|
return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs), onNotFoundResult = {
|
||||||
// Fallback: property delegation (getValue then call result)
|
// Fallback: property delegation (getValue then call result)
|
||||||
val propVal = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
val propVal = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name)))
|
||||||
propVal.invoke(scope, this, args, rec.declaringClass ?: cls)
|
propVal.invoke(scope, this, args, rec.declaringClass ?: decl)
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
val decl = rec.declaringClass ?: cls
|
|
||||||
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
val effectiveCaller = caller ?: if (scope.thisObj === this) objClass else null
|
||||||
if (!canAccessMember(rec.visibility, decl, effectiveCaller))
|
if (!canAccessMember(rec.visibility, decl, effectiveCaller, name))
|
||||||
scope.raiseError(
|
scope.raiseError(
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
@@ -304,7 +455,6 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
return resolved.value.invoke(scope, this, args, resolved.declaringClass)
|
return resolved.value.invoke(scope, this, args, resolved.declaringClass)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
|
||||||
|
|
||||||
// 2. Fall back to super (handles extensions and root fallback)
|
// 2. Fall back to super (handles extensions and root fallback)
|
||||||
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
|
||||||
@@ -339,7 +489,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
// values, so we save size of the construction:
|
// values, so we save size of the construction:
|
||||||
|
|
||||||
// using objlist allow for some optimizations:
|
// using objlist allow for some optimizations:
|
||||||
val params = meta.params.map { readField(scope, it.name).value }
|
val params = meta.params.filter { !it.isTransient }.map { readField(scope, it.name).value }
|
||||||
encoder.encodeAnyList(scope, params)
|
encoder.encodeAnyList(scope, params)
|
||||||
val vars = serializingVars.values.map { it.value }
|
val vars = serializingVars.values.map { it.value }
|
||||||
if (vars.isNotEmpty()) {
|
if (vars.isNotEmpty()) {
|
||||||
@@ -358,8 +508,10 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
val result = mutableMapOf<String, JsonElement>()
|
val result = mutableMapOf<String, JsonElement>()
|
||||||
val meta = objClass.constructorMeta
|
val meta = objClass.constructorMeta
|
||||||
?: scope.raiseError("can't serialize non-serializable object (no constructor meta)")
|
?: scope.raiseError("can't serialize non-serializable object (no constructor meta)")
|
||||||
for (entry in meta.params)
|
for (entry in meta.params) {
|
||||||
|
if (!entry.isTransient)
|
||||||
result[entry.name] = readField(scope, entry.name).value.toJson(scope)
|
result[entry.name] = readField(scope, entry.name).value.toJson(scope)
|
||||||
|
}
|
||||||
for (i in serializingVars) {
|
for (i in serializingVars) {
|
||||||
// remove T:: prefix from the field name for JSON
|
// remove T:: prefix from the field name for JSON
|
||||||
val parts = i.key.split("::")
|
val parts = i.key.split("::")
|
||||||
@@ -378,7 +530,8 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
it.value.type.serializable &&
|
it.value.type.serializable &&
|
||||||
it.value.type == ObjRecord.Type.Field &&
|
it.value.type == ObjRecord.Type.Field &&
|
||||||
it.value.isMutable &&
|
it.value.isMutable &&
|
||||||
!metaParams.contains(it.key)
|
!metaParams.contains(it.key) &&
|
||||||
|
!it.value.isTransient
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -399,7 +552,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
|
|||||||
|
|
||||||
protected val comparableVars: Map<String, ObjRecord> by lazy {
|
protected val comparableVars: Map<String, ObjRecord> by lazy {
|
||||||
instanceScope.objects.filter {
|
instanceScope.objects.filter {
|
||||||
it.value.type.comparable && (it.value.type != ObjRecord.Type.Field || it.value.isMutable)
|
it.value.type.comparable && (it.value.type != ObjRecord.Type.Field || it.value.isMutable) && !it.value.isTransient
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -429,11 +582,19 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
override suspend fun readField(scope: Scope, name: String): ObjRecord {
|
||||||
// Qualified field access: prefer mangled storage for the qualified ancestor
|
// Qualified field access: prefer mangled storage for the qualified ancestor
|
||||||
val mangled = "${startClass.className}::$name"
|
val mangled = "${startClass.className}::$name"
|
||||||
|
instance.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
// Visibility: declaring class is the qualified ancestor for mangled storage
|
||||||
|
val decl = rec.declaringClass ?: startClass
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
|
return instance.resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
instance.instanceScope.objects[mangled]?.let { rec ->
|
instance.instanceScope.objects[mangled]?.let { rec ->
|
||||||
// Visibility: declaring class is the qualified ancestor for mangled storage
|
// Visibility: declaring class is the qualified ancestor for mangled storage
|
||||||
val decl = rec.declaringClass ?: startClass
|
val decl = rec.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
return instance.resolveRecord(scope, rec, name, decl)
|
return instance.resolveRecord(scope, rec, name, decl)
|
||||||
}
|
}
|
||||||
@@ -442,7 +603,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope[name]?.let { rec ->
|
instance.instanceScope[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(
|
scope.raiseError(
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
@@ -456,7 +617,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
||||||
val decl = r.declaringClass ?: startClass
|
val decl = r.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(r.visibility, decl, caller))
|
if (!canAccessMember(r.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
|
||||||
|
|
||||||
return instance.resolveRecord(scope, r, name, decl)
|
return instance.resolveRecord(scope, r, name, decl)
|
||||||
@@ -465,10 +626,22 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
|
||||||
// Qualified write: target mangled storage for the ancestor
|
// Qualified write: target mangled storage for the ancestor
|
||||||
val mangled = "${startClass.className}::$name"
|
val mangled = "${startClass.className}::$name"
|
||||||
|
instance.fieldRecordForKey(mangled)?.let { f ->
|
||||||
|
val decl = f.declaringClass ?: startClass
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
|
ObjIllegalAccessException(
|
||||||
|
scope,
|
||||||
|
"can't assign to field $name (declared in ${decl.className})"
|
||||||
|
).raise()
|
||||||
|
if (!f.isMutable && f.value !== ObjUnset) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
||||||
|
if (f.value.assign(scope, newValue) == null) f.value = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
instance.instanceScope.objects[mangled]?.let { f ->
|
instance.instanceScope.objects[mangled]?.let { f ->
|
||||||
val decl = f.declaringClass ?: startClass
|
val decl = f.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
"can't assign to field $name (declared in ${decl.className})"
|
"can't assign to field $name (declared in ${decl.className})"
|
||||||
@@ -482,7 +655,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope[name]?.let { f ->
|
instance.instanceScope[name]?.let { f ->
|
||||||
val decl = f.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
val decl = f.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(f.effectiveWriteVisibility, decl, caller, name))
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
"can't assign to field $name (declared in ${decl?.className ?: "?"})"
|
"can't assign to field $name (declared in ${decl?.className ?: "?"})"
|
||||||
@@ -495,7 +668,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
|
||||||
val decl = r.declaringClass ?: startClass
|
val decl = r.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(r.effectiveWriteVisibility, decl, caller))
|
if (!canAccessMember(r.effectiveWriteVisibility, decl, caller, name))
|
||||||
ObjIllegalAccessException(scope, "can't assign to field $name (declared in ${decl.className})").raise()
|
ObjIllegalAccessException(scope, "can't assign to field $name (declared in ${decl.className})").raise()
|
||||||
if (!r.isMutable) scope.raiseError("can't assign to read-only field: $name")
|
if (!r.isMutable) scope.raiseError("can't assign to read-only field: $name")
|
||||||
if (r.value.assign(scope, newValue) == null) r.value = newValue
|
if (r.value.assign(scope, newValue) == null) r.value = newValue
|
||||||
@@ -511,7 +684,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
memberFromAncestor(name)?.let { rec ->
|
memberFromAncestor(name)?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: startClass
|
val decl = rec.declaringClass ?: startClass
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
|
||||||
val saved = instance.instanceScope.currentClassCtx
|
val saved = instance.instanceScope.currentClassCtx
|
||||||
instance.instanceScope.currentClassCtx = decl
|
instance.instanceScope.currentClassCtx = decl
|
||||||
@@ -526,7 +699,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
|
|||||||
instance.instanceScope[name]?.let { rec ->
|
instance.instanceScope[name]?.let { rec ->
|
||||||
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
val decl = rec.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
|
||||||
val caller = scope.currentClassCtx
|
val caller = scope.currentClassCtx
|
||||||
if (!canAccessMember(rec.visibility, decl, caller))
|
if (!canAccessMember(rec.visibility, decl, caller, name))
|
||||||
scope.raiseError(
|
scope.raiseError(
|
||||||
ObjIllegalAccessException(
|
ObjIllegalAccessException(
|
||||||
scope,
|
scope,
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -28,13 +28,26 @@ import net.sergeych.lynon.LynonType
|
|||||||
class ObjInstanceClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
class ObjInstanceClass(val name: String, vararg parents: ObjClass) : ObjClass(name, *parents) {
|
||||||
|
|
||||||
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
|
||||||
val args = decoder.decodeAnyList(scope)
|
val serializedArgs = decoder.decodeAnyList(scope)
|
||||||
val actualSize = constructorMeta?.params?.size ?: 0
|
val meta = constructorMeta ?: scope.raiseError("no constructor meta for $name")
|
||||||
if (args.size > actualSize)
|
val nonTransientCount = meta.params.count { !it.isTransient }
|
||||||
scope.raiseIllegalArgument("constructor $name has only $actualSize but serialized version has ${args.size}")
|
if (serializedArgs.size != nonTransientCount)
|
||||||
val newScope = scope.createChildScope(args = Arguments(args))
|
scope.raiseIllegalArgument("constructor $name expects $nonTransientCount non-transient arguments, but serialized version has ${serializedArgs.size}")
|
||||||
val instance = createInstance(newScope)
|
|
||||||
initializeInstance(instance, newScope.args, runConstructors = false)
|
var sIdx = 0
|
||||||
|
val namedArgs = mutableMapOf<String, Obj>()
|
||||||
|
for (p in meta.params) {
|
||||||
|
if (!p.isTransient) {
|
||||||
|
namedArgs[p.name] = serializedArgs[sIdx++]
|
||||||
|
} else if (p.defaultValue == null) {
|
||||||
|
// If transient parameter has no default value, we use ObjNull to avoid "too few arguments" error
|
||||||
|
namedArgs[p.name] = ObjNull
|
||||||
|
}
|
||||||
|
}
|
||||||
|
// Using named arguments allows the constructor to apply default values for transient parameters
|
||||||
|
val newArgs = Arguments(list = emptyList<Obj>(), named = namedArgs)
|
||||||
|
val instance = createInstance(scope.createChildScope(args = newArgs))
|
||||||
|
initializeInstance(instance, newArgs, runConstructors = false)
|
||||||
return instance.apply {
|
return instance.apply {
|
||||||
deserializeStateVars(scope, decoder)
|
deserializeStateVars(scope, decoder)
|
||||||
invokeInstanceMethod(scope, "onDeserialized") { ObjVoid }
|
invokeInstanceMethod(scope, "onDeserialized") { ObjVoid }
|
||||||
|
|||||||
@@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
package net.sergeych.lyng.obj
|
package net.sergeych.lyng.obj
|
||||||
|
|
||||||
|
import kotlinx.datetime.*
|
||||||
import kotlinx.serialization.json.JsonElement
|
import kotlinx.serialization.json.JsonElement
|
||||||
import kotlinx.serialization.json.JsonPrimitive
|
import kotlinx.serialization.json.JsonPrimitive
|
||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
@@ -28,7 +29,6 @@ import net.sergeych.lynon.LynonEncoder
|
|||||||
import net.sergeych.lynon.LynonSettings
|
import net.sergeych.lynon.LynonSettings
|
||||||
import net.sergeych.lynon.LynonType
|
import net.sergeych.lynon.LynonType
|
||||||
import kotlin.time.Clock
|
import kotlin.time.Clock
|
||||||
import kotlin.time.Instant
|
|
||||||
import kotlin.time.isDistantFuture
|
import kotlin.time.isDistantFuture
|
||||||
import kotlin.time.isDistantPast
|
import kotlin.time.isDistantPast
|
||||||
|
|
||||||
@@ -122,6 +122,7 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
val nanos = (a0.value - seconds) * 1e9
|
val nanos = (a0.value - seconds) * 1e9
|
||||||
Instant.fromEpochSeconds(seconds, nanos.toLong())
|
Instant.fromEpochSeconds(seconds, nanos.toLong())
|
||||||
}
|
}
|
||||||
|
is ObjString -> Instant.parse(a0.value)
|
||||||
is ObjInstant -> a0.instant
|
is ObjInstant -> a0.instant
|
||||||
|
|
||||||
else -> {
|
else -> {
|
||||||
@@ -189,6 +190,18 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
moduleName = "lyng.time",
|
moduleName = "lyng.time",
|
||||||
getter = { ObjInt(thisAs<ObjInstant>().instant.nanosecondsOfSecond.toLong()) }
|
getter = { ObjInt(thisAs<ObjInstant>().instant.nanosecondsOfSecond.toLong()) }
|
||||||
)
|
)
|
||||||
|
addFnDoc(
|
||||||
|
name = "truncateToMinute",
|
||||||
|
doc = "Truncate this instant to the nearest minute.",
|
||||||
|
returns = type("lyng.Instant"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
val t = thisAs<ObjInstant>().instant
|
||||||
|
val tz = TimeZone.UTC
|
||||||
|
val dt = t.toLocalDateTime(tz)
|
||||||
|
val truncated = LocalDateTime(dt.year, dt.month, dt.dayOfMonth, dt.hour, dt.minute, 0, 0)
|
||||||
|
ObjInstant(truncated.toInstant(tz), LynonSettings.InstantTruncateMode.Second)
|
||||||
|
}
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "truncateToSecond",
|
name = "truncateToSecond",
|
||||||
doc = "Truncate this instant to the nearest second.",
|
doc = "Truncate this instant to the nearest second.",
|
||||||
@@ -222,6 +235,43 @@ class ObjInstant(val instant: Instant,val truncateMode: LynonSettings.InstantTru
|
|||||||
LynonSettings.InstantTruncateMode.Microsecond
|
LynonSettings.InstantTruncateMode.Microsecond
|
||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toRFC3339",
|
||||||
|
doc = "Return the RFC3339 string representation of this instant in UTC (e.g., '1970-01-01T00:00:00Z').",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
thisAs<ObjInstant>().instant.toString().toObj()
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toSortableString",
|
||||||
|
doc = "Alias to toRFC3339.",
|
||||||
|
returns = type("lyng.String"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
thisAs<ObjInstant>().instant.toString().toObj()
|
||||||
|
}
|
||||||
|
|
||||||
|
addFnDoc(
|
||||||
|
name = "toDateTime",
|
||||||
|
doc = "Convert this absolute instant to a localized DateTime object in the specified time zone. " +
|
||||||
|
"Accepts a timezone ID string (e.g., 'UTC', '+02:00') or an integer offset in seconds. " +
|
||||||
|
"If no argument is provided, the system's current default time zone is used.",
|
||||||
|
params = listOf(net.sergeych.lyng.miniast.ParamDoc("tz", type = type("lyng.Any", true))),
|
||||||
|
returns = type("lyng.DateTime"),
|
||||||
|
moduleName = "lyng.time"
|
||||||
|
) {
|
||||||
|
val tz = when (val a = args.list.getOrNull(0)) {
|
||||||
|
null -> TimeZone.currentSystemDefault()
|
||||||
|
is ObjString -> TimeZone.of(a.value)
|
||||||
|
is ObjInt -> UtcOffset(seconds = a.value.toInt()).asTimeZone()
|
||||||
|
else -> raiseIllegalArgument("invalid timezone: $a")
|
||||||
|
}
|
||||||
|
ObjDateTime(thisAs<ObjInstant>().instant, tz)
|
||||||
|
}
|
||||||
|
|
||||||
// class members
|
// class members
|
||||||
|
|
||||||
addClassConst("distantFuture", distantFuture)
|
addClassConst("distantFuture", distantFuture)
|
||||||
|
|||||||
@@ -55,7 +55,11 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
|||||||
|
|
||||||
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
if (other !is Numeric) return -2
|
if (other !is Numeric) return -2
|
||||||
return value.compareTo(other.doubleValue)
|
return if (other is ObjInt) {
|
||||||
|
value.compareTo(other.value)
|
||||||
|
} else {
|
||||||
|
doubleValue.compareTo(other.doubleValue)
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun toString(): String = value.toString()
|
override fun toString(): String = value.toString()
|
||||||
@@ -159,13 +163,19 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
|||||||
}
|
}
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
private val cache = Array(256) { ObjInt((it - 128).toLong(), true) }
|
internal const val CACHE_LOW: Long = -1024L
|
||||||
|
internal const val CACHE_HIGH: Long = 1023L
|
||||||
|
private val cache = Array((CACHE_HIGH - CACHE_LOW + 1).toInt()) {
|
||||||
|
ObjInt((it + CACHE_LOW).toLong(), true)
|
||||||
|
}
|
||||||
|
|
||||||
fun of(value: Long): ObjInt {
|
fun of(value: Long): ObjInt {
|
||||||
return if (value in -128L..127L) cache[(value + 128).toInt()]
|
return if (value in CACHE_LOW..CACHE_HIGH) cache[(value - CACHE_LOW).toInt()]
|
||||||
else ObjInt(value)
|
else ObjInt(value)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
internal fun cacheArray(): Array<ObjInt> = cache
|
||||||
|
|
||||||
val Zero = of(0)
|
val Zero = of(0)
|
||||||
val One = of(1)
|
val One = of(1)
|
||||||
val type = object : ObjClass("Int") {
|
val type = object : ObjClass("Int") {
|
||||||
|
|||||||
@@ -96,6 +96,30 @@ class ObjRange(val start: Obj?, val end: Obj?, val isEndInclusive: Boolean) : Ob
|
|||||||
if (other is ObjRange)
|
if (other is ObjRange)
|
||||||
return containsRange(scope, other)
|
return containsRange(scope, other)
|
||||||
|
|
||||||
|
if (net.sergeych.lyng.PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
if (start is ObjInt && end is ObjInt && other is ObjInt) {
|
||||||
|
val s = start.value
|
||||||
|
val e = end.value
|
||||||
|
val v = other.value
|
||||||
|
if (v < s) return false
|
||||||
|
return if (isEndInclusive) v <= e else v < e
|
||||||
|
}
|
||||||
|
if (start is ObjChar && end is ObjChar && other is ObjChar) {
|
||||||
|
val s = start.value
|
||||||
|
val e = end.value
|
||||||
|
val v = other.value
|
||||||
|
if (v < s) return false
|
||||||
|
return if (isEndInclusive) v <= e else v < e
|
||||||
|
}
|
||||||
|
if (start is ObjString && end is ObjString && other is ObjString) {
|
||||||
|
val s = start.value
|
||||||
|
val e = end.value
|
||||||
|
val v = other.value
|
||||||
|
if (v < s) return false
|
||||||
|
return if (isEndInclusive) v <= e else v < e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if (start == null && end == null) return true
|
if (start == null && end == null) return true
|
||||||
if (start != null) {
|
if (start != null) {
|
||||||
if (start.compareTo(scope, other) > 0) return false
|
if (start.compareTo(scope, other) > 0) return false
|
||||||
@@ -241,4 +265,3 @@ class ObjRange(val start: Obj?, val end: Obj?, val isEndInclusive: Boolean) : Ob
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -58,7 +58,7 @@ class ObjRangeIterator(val self: ObjRange) : Obj() {
|
|||||||
start.value.code.toLong() + nextIndex++
|
start.value.code.toLong() + nextIndex++
|
||||||
else
|
else
|
||||||
scope.raiseError("iterator error: unsupported range start")
|
scope.raiseError("iterator error: unsupported range start")
|
||||||
if( isCharRange ) ObjChar(x.toInt().toChar()) else ObjInt(x)
|
if (isCharRange) ObjChar(x.toInt().toChar()) else ObjInt.of(x)
|
||||||
}
|
}
|
||||||
else {
|
else {
|
||||||
scope.raiseError(ObjIterationFinishedException(scope))
|
scope.raiseError(ObjIterationFinishedException(scope))
|
||||||
@@ -83,13 +83,18 @@ class ObjRangeIterator(val self: ObjRange) : Obj() {
|
|||||||
class ObjFastIntRangeIterator(private val start: Int, private val endExclusive: Int) : Obj() {
|
class ObjFastIntRangeIterator(private val start: Int, private val endExclusive: Int) : Obj() {
|
||||||
|
|
||||||
private var cur: Int = start
|
private var cur: Int = start
|
||||||
|
private val cacheLow = ObjInt.CACHE_LOW.toInt()
|
||||||
|
private val useCache = start >= cacheLow && endExclusive <= ObjInt.CACHE_HIGH.toInt() + 1
|
||||||
|
private val cache = if (useCache) ObjInt.cacheArray() else null
|
||||||
|
|
||||||
override val objClass: ObjClass get() = type
|
override val objClass: ObjClass get() = type
|
||||||
|
|
||||||
fun hasNext(): Boolean = cur < endExclusive
|
fun hasNext(): Boolean = cur < endExclusive
|
||||||
|
|
||||||
fun next(scope: Scope): Obj =
|
fun next(scope: Scope): Obj =
|
||||||
if (cur < endExclusive) ObjInt(cur++.toLong())
|
if (cur < endExclusive) {
|
||||||
|
if (useCache && cache != null) cache[cur++ - cacheLow] else ObjInt(cur++.toLong())
|
||||||
|
}
|
||||||
else scope.raiseError(ObjIterationFinishedException(scope))
|
else scope.raiseError(ObjIterationFinishedException(scope))
|
||||||
|
|
||||||
companion object {
|
companion object {
|
||||||
|
|||||||
@@ -152,6 +152,80 @@ class BinaryOpRef(private val op: BinOp, private val left: ObjRef, private val r
|
|||||||
|
|
||||||
// Primitive fast paths for common cases (guarded by PerfFlags.PRIMITIVE_FASTOPS)
|
// Primitive fast paths for common cases (guarded by PerfFlags.PRIMITIVE_FASTOPS)
|
||||||
if (PerfFlags.PRIMITIVE_FASTOPS) {
|
if (PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
// Fast membership for common containers
|
||||||
|
if (op == BinOp.IN || op == BinOp.NOTIN) {
|
||||||
|
val inResult: Boolean? = when (b) {
|
||||||
|
is ObjList -> {
|
||||||
|
if (a is ObjInt) {
|
||||||
|
var i = 0
|
||||||
|
val sz = b.list.size
|
||||||
|
var found = false
|
||||||
|
while (i < sz) {
|
||||||
|
val v = b.list[i]
|
||||||
|
if (v is ObjInt && v.value == a.value) {
|
||||||
|
found = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
i++
|
||||||
|
}
|
||||||
|
found
|
||||||
|
} else {
|
||||||
|
b.list.contains(a)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is ObjSet -> b.set.contains(a)
|
||||||
|
is ObjMap -> b.map.containsKey(a)
|
||||||
|
is ObjRange -> {
|
||||||
|
when (a) {
|
||||||
|
is ObjInt -> {
|
||||||
|
val s = b.start as? ObjInt
|
||||||
|
val e = b.end as? ObjInt
|
||||||
|
val v = a.value
|
||||||
|
if (s == null && e == null) null
|
||||||
|
else {
|
||||||
|
if (s != null && v < s.value) false
|
||||||
|
else if (e != null) if (b.isEndInclusive) v <= e.value else v < e.value else true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is ObjChar -> {
|
||||||
|
val s = b.start as? ObjChar
|
||||||
|
val e = b.end as? ObjChar
|
||||||
|
val v = a.value
|
||||||
|
if (s == null && e == null) null
|
||||||
|
else {
|
||||||
|
if (s != null && v < s.value) false
|
||||||
|
else if (e != null) if (b.isEndInclusive) v <= e.value else v < e.value else true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is ObjString -> {
|
||||||
|
val s = b.start as? ObjString
|
||||||
|
val e = b.end as? ObjString
|
||||||
|
val v = a.value
|
||||||
|
if (s == null && e == null) null
|
||||||
|
else {
|
||||||
|
if (s != null && v < s.value) false
|
||||||
|
else if (e != null) if (b.isEndInclusive) v <= e.value else v < e.value else true
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
is ObjString -> when (a) {
|
||||||
|
is ObjString -> b.value.contains(a.value)
|
||||||
|
is ObjChar -> b.value.contains(a.value)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
if (inResult != null) {
|
||||||
|
if (PerfFlags.PIC_DEBUG_COUNTERS) PerfStats.primitiveFastOpsHit++
|
||||||
|
return if (op == BinOp.IN) {
|
||||||
|
if (inResult) ObjTrue else ObjFalse
|
||||||
|
} else {
|
||||||
|
if (inResult) ObjFalse else ObjTrue
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
// Fast boolean ops when both operands are ObjBool
|
// Fast boolean ops when both operands are ObjBool
|
||||||
if (a is ObjBool && b is ObjBool) {
|
if (a is ObjBool && b is ObjBool) {
|
||||||
val r: Obj? = when (op) {
|
val r: Obj? = when (op) {
|
||||||
@@ -381,7 +455,7 @@ class CastRef(
|
|||||||
}
|
}
|
||||||
|
|
||||||
/** Qualified `this@Type`: resolves to a view of current `this` starting dispatch from the ancestor Type. */
|
/** Qualified `this@Type`: resolves to a view of current `this` starting dispatch from the ancestor Type. */
|
||||||
class QualifiedThisRef(private val typeName: String, private val atPos: Pos) : ObjRef {
|
class QualifiedThisRef(val typeName: String, private val atPos: Pos) : ObjRef {
|
||||||
override suspend fun get(scope: Scope): ObjRecord {
|
override suspend fun get(scope: Scope): ObjRecord {
|
||||||
val t = scope[typeName]?.value as? ObjClass
|
val t = scope[typeName]?.value as? ObjClass
|
||||||
?: scope.raiseError("unknown type $typeName")
|
?: scope.raiseError("unknown type $typeName")
|
||||||
@@ -403,6 +477,188 @@ class QualifiedThisRef(private val typeName: String, private val atPos: Pos) : O
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
private suspend fun resolveQualifiedThisInstance(scope: Scope, typeName: String): Pair<ObjInstance, ObjClass> {
|
||||||
|
val t = scope[typeName]?.value as? ObjClass
|
||||||
|
?: scope.raiseError("unknown type $typeName")
|
||||||
|
var s: Scope? = scope
|
||||||
|
while (s != null) {
|
||||||
|
val inst = s.thisObj as? ObjInstance
|
||||||
|
if (inst != null && (inst.objClass === t || inst.objClass.allParentsSet.contains(t))) {
|
||||||
|
return inst to t
|
||||||
|
}
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
scope.raiseClassCastError(
|
||||||
|
"No instance of type ${t.className} found in the scope chain"
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fast path for direct `this@Type.name` access using slot maps when possible.
|
||||||
|
*/
|
||||||
|
class QualifiedThisFieldSlotRef(
|
||||||
|
private val typeName: String,
|
||||||
|
val name: String,
|
||||||
|
private val isOptional: Boolean
|
||||||
|
) : ObjRef {
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord {
|
||||||
|
val (inst, startClass) = resolveQualifiedThisInstance(scope, typeName)
|
||||||
|
if (isOptional && inst == ObjNull) return ObjNull.asMutable
|
||||||
|
|
||||||
|
if (startClass !== inst.objClass) {
|
||||||
|
return ObjQualifiedView(inst, startClass).readField(scope, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (caller != null) {
|
||||||
|
val mangled = caller.mangledName(name)
|
||||||
|
inst.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return inst.resolveRecord(scope, rec, name, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inst.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return inst.resolveRecord(scope, rec, name, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val key = inst.objClass.publicMemberResolution[name] ?: name
|
||||||
|
inst.fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
inst.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: inst.objClass.findDeclaringClassOf(name) ?: inst.objClass
|
||||||
|
return inst.resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return inst.readField(scope, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setAt(pos: Pos, scope: Scope, newValue: Obj) {
|
||||||
|
val (inst, startClass) = resolveQualifiedThisInstance(scope, typeName)
|
||||||
|
if (isOptional && inst == ObjNull) return
|
||||||
|
|
||||||
|
if (startClass !== inst.objClass) {
|
||||||
|
ObjQualifiedView(inst, startClass).writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (caller != null) {
|
||||||
|
val mangled = caller.mangledName(name)
|
||||||
|
inst.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
writeDirectOrFallback(scope, inst, rec, name, newValue, caller)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inst.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
inst.writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val key = inst.objClass.publicMemberResolution[name] ?: name
|
||||||
|
inst.fieldRecordForKey(key)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: inst.objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name)) {
|
||||||
|
writeDirectOrFallback(scope, inst, rec, name, newValue, decl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
inst.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
inst.writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
inst.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun writeDirectOrFallback(
|
||||||
|
scope: Scope,
|
||||||
|
inst: ObjInstance,
|
||||||
|
rec: ObjRecord,
|
||||||
|
name: String,
|
||||||
|
newValue: Obj,
|
||||||
|
decl: ObjClass?
|
||||||
|
) {
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract) {
|
||||||
|
if (!rec.isMutable && rec.value !== ObjUnset) {
|
||||||
|
ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
||||||
|
}
|
||||||
|
if (rec.value.assign(scope, newValue) == null) rec.value = newValue
|
||||||
|
} else {
|
||||||
|
inst.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fast path for direct `this@Type.method(...)` calls using slots when the qualifier is the
|
||||||
|
* dynamic class. Otherwise falls back to a qualified view dispatch.
|
||||||
|
*/
|
||||||
|
class QualifiedThisMethodSlotCallRef(
|
||||||
|
private val typeName: String,
|
||||||
|
private val name: String,
|
||||||
|
private val args: List<ParsedArgument>,
|
||||||
|
private val tailBlock: Boolean,
|
||||||
|
private val isOptional: Boolean
|
||||||
|
) : ObjRef {
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord = evalValue(scope).asReadonly
|
||||||
|
|
||||||
|
override suspend fun evalValue(scope: Scope): Obj {
|
||||||
|
val (inst, startClass) = resolveQualifiedThisInstance(scope, typeName)
|
||||||
|
if (isOptional && inst == ObjNull) return ObjNull
|
||||||
|
val callArgs = args.toArguments(scope, tailBlock)
|
||||||
|
|
||||||
|
if (startClass !== inst.objClass) {
|
||||||
|
return ObjQualifiedView(inst, startClass).invokeInstanceMethod(scope, name, callArgs, null)
|
||||||
|
}
|
||||||
|
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (caller != null) {
|
||||||
|
val mangled = caller.mangledName(name)
|
||||||
|
inst.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (callArgs.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, inst, caller)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(inst.instanceScope, inst, callArgs, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val key = inst.objClass.publicMemberResolution[name] ?: name
|
||||||
|
inst.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: inst.objClass.findDeclaringClassOf(name) ?: inst.objClass
|
||||||
|
val effectiveCaller = caller ?: if (scope.thisObj === inst) inst.objClass else null
|
||||||
|
if (!canAccessMember(rec.visibility, decl, effectiveCaller, name))
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (callArgs.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, inst, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(inst.instanceScope, inst, callArgs, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return inst.invokeInstanceMethod(scope, name, callArgs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/** Assignment compound op: target op= value */
|
/** Assignment compound op: target op= value */
|
||||||
class AssignOpRef(
|
class AssignOpRef(
|
||||||
private val op: BinOp,
|
private val op: BinOp,
|
||||||
@@ -422,7 +678,37 @@ class AssignOpRef(
|
|||||||
else -> null
|
else -> null
|
||||||
}
|
}
|
||||||
if (inPlace != null) return inPlace.asReadonly
|
if (inPlace != null) return inPlace.asReadonly
|
||||||
val result: Obj = when (op) {
|
val fast: Obj? = if (PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
when {
|
||||||
|
x is ObjInt && y is ObjInt -> {
|
||||||
|
val xv = x.value
|
||||||
|
val yv = y.value
|
||||||
|
when (op) {
|
||||||
|
BinOp.PLUS -> ObjInt.of(xv + yv)
|
||||||
|
BinOp.MINUS -> ObjInt.of(xv - yv)
|
||||||
|
BinOp.STAR -> ObjInt.of(xv * yv)
|
||||||
|
BinOp.SLASH -> if (yv != 0L) ObjInt.of(xv / yv) else null
|
||||||
|
BinOp.PERCENT -> if (yv != 0L) ObjInt.of(xv % yv) else null
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
(x is ObjInt || x is ObjReal) && (y is ObjInt || y is ObjReal) -> {
|
||||||
|
val xv = if (x is ObjInt) x.doubleValue else (x as ObjReal).value
|
||||||
|
val yv = if (y is ObjInt) y.doubleValue else (y as ObjReal).value
|
||||||
|
when (op) {
|
||||||
|
BinOp.PLUS -> ObjReal.of(xv + yv)
|
||||||
|
BinOp.MINUS -> ObjReal.of(xv - yv)
|
||||||
|
BinOp.STAR -> ObjReal.of(xv * yv)
|
||||||
|
BinOp.SLASH -> ObjReal.of(xv / yv)
|
||||||
|
BinOp.PERCENT -> ObjReal.of(xv % yv)
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
}
|
||||||
|
x is ObjString && op == BinOp.PLUS -> ObjString(x.value + y.toString())
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
} else null
|
||||||
|
val result: Obj = fast ?: when (op) {
|
||||||
BinOp.PLUS -> x.plus(scope, y)
|
BinOp.PLUS -> x.plus(scope, y)
|
||||||
BinOp.MINUS -> x.minus(scope, y)
|
BinOp.MINUS -> x.minus(scope, y)
|
||||||
BinOp.STAR -> x.mul(scope, y)
|
BinOp.STAR -> x.mul(scope, y)
|
||||||
@@ -450,7 +736,15 @@ class IncDecRef(
|
|||||||
// We now treat numbers as immutable and always perform write-back via setAt.
|
// We now treat numbers as immutable and always perform write-back via setAt.
|
||||||
// This avoids issues where literals are shared and mutated in-place.
|
// This avoids issues where literals are shared and mutated in-place.
|
||||||
// For post-inc: return ORIGINAL value; for pre-inc: return NEW value.
|
// For post-inc: return ORIGINAL value; for pre-inc: return NEW value.
|
||||||
val result = if (isIncrement) v.plus(scope, one) else v.minus(scope, one)
|
val result = if (PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
when (v) {
|
||||||
|
is ObjInt -> if (isIncrement) ObjInt.of(v.value + 1L) else ObjInt.of(v.value - 1L)
|
||||||
|
is ObjReal -> if (isIncrement) ObjReal.of(v.value + 1.0) else ObjReal.of(v.value - 1.0)
|
||||||
|
else -> if (isIncrement) v.plus(scope, one) else v.minus(scope, one)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
if (isIncrement) v.plus(scope, one) else v.minus(scope, one)
|
||||||
|
}
|
||||||
target.setAt(atPos, scope, result)
|
target.setAt(atPos, scope, result)
|
||||||
return (if (isPost) v else result).asReadonly
|
return (if (isPost) v else result).asReadonly
|
||||||
}
|
}
|
||||||
@@ -691,9 +985,20 @@ class FieldRef(
|
|||||||
if (effectiveKey != null) {
|
if (effectiveKey != null) {
|
||||||
rKey1 = key; rVer1 = ver; rGetter1 = { obj, sc ->
|
rKey1 = key; rVer1 = ver; rGetter1 = { obj, sc ->
|
||||||
if (obj is ObjInstance && obj.objClass === cls) {
|
if (obj is ObjInstance && obj.objClass === cls) {
|
||||||
val rec = obj.instanceScope.objects[effectiveKey]
|
val slot = cls.fieldSlotForKey(effectiveKey)
|
||||||
|
if (slot != null) {
|
||||||
|
val idx = slot.slot
|
||||||
|
val rec = if (idx >= 0 && idx < obj.fieldSlots.size) obj.fieldSlots[idx] else null
|
||||||
|
if (rec != null &&
|
||||||
|
(rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) &&
|
||||||
|
!rec.isAbstract) {
|
||||||
|
rec
|
||||||
|
} else obj.readField(sc, name)
|
||||||
|
} else {
|
||||||
|
val rec = obj.fieldRecordForKey(effectiveKey) ?: obj.instanceScope.objects[effectiveKey]
|
||||||
if (rec != null && rec.type != ObjRecord.Type.Delegated) rec
|
if (rec != null && rec.type != ObjRecord.Type.Delegated) rec
|
||||||
else obj.readField(sc, name)
|
else obj.readField(sc, name)
|
||||||
|
}
|
||||||
} else obj.readField(sc, name)
|
} else obj.readField(sc, name)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -809,10 +1114,24 @@ class FieldRef(
|
|||||||
if (effectiveKey != null) {
|
if (effectiveKey != null) {
|
||||||
wKey1 = key; wVer1 = ver; wSetter1 = { obj, sc, nv ->
|
wKey1 = key; wVer1 = ver; wSetter1 = { obj, sc, nv ->
|
||||||
if (obj is ObjInstance && obj.objClass === cls) {
|
if (obj is ObjInstance && obj.objClass === cls) {
|
||||||
val rec = obj.instanceScope.objects[effectiveKey]
|
val slot = cls.fieldSlotForKey(effectiveKey)
|
||||||
if (rec != null && rec.effectiveWriteVisibility == Visibility.Public && rec.isMutable && rec.type == ObjRecord.Type.Field) {
|
if (slot != null) {
|
||||||
|
val idx = slot.slot
|
||||||
|
val rec = if (idx >= 0 && idx < obj.fieldSlots.size) obj.fieldSlots[idx] else null
|
||||||
|
if (rec != null &&
|
||||||
|
rec.effectiveWriteVisibility == Visibility.Public &&
|
||||||
|
rec.isMutable &&
|
||||||
|
(rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) &&
|
||||||
|
!rec.isAbstract) {
|
||||||
if (rec.value.assign(sc, nv) == null) rec.value = nv
|
if (rec.value.assign(sc, nv) == null) rec.value = nv
|
||||||
} else obj.writeField(sc, name, nv)
|
} else obj.writeField(sc, name, nv)
|
||||||
|
} else {
|
||||||
|
val rec = obj.fieldRecordForKey(effectiveKey) ?: obj.instanceScope.objects[effectiveKey]
|
||||||
|
if (rec != null && rec.effectiveWriteVisibility == Visibility.Public && rec.isMutable &&
|
||||||
|
(rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField)) {
|
||||||
|
if (rec.value.assign(sc, nv) == null) rec.value = nv
|
||||||
|
} else obj.writeField(sc, name, nv)
|
||||||
|
}
|
||||||
} else obj.writeField(sc, name, nv)
|
} else obj.writeField(sc, name, nv)
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
@@ -890,6 +1209,113 @@ class FieldRef(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fast path for direct `this.name` access using slot maps.
|
||||||
|
* Falls back to normal member resolution when needed.
|
||||||
|
*/
|
||||||
|
class ThisFieldSlotRef(
|
||||||
|
val name: String,
|
||||||
|
private val isOptional: Boolean
|
||||||
|
) : ObjRef {
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord {
|
||||||
|
val th = scope.thisObj
|
||||||
|
if (th == ObjNull && isOptional) return ObjNull.asMutable
|
||||||
|
if (th !is ObjInstance) return th.readField(scope, name)
|
||||||
|
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (caller != null) {
|
||||||
|
val mangled = caller.mangledName(name)
|
||||||
|
th.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return th.resolveRecord(scope, rec, name, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return th.resolveRecord(scope, rec, name, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val key = th.objClass.publicMemberResolution[name] ?: name
|
||||||
|
th.fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: th.objClass.findDeclaringClassOf(name) ?: th.objClass
|
||||||
|
return th.resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return th.readField(scope, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setAt(pos: Pos, scope: Scope, newValue: Obj) {
|
||||||
|
val th = scope.thisObj
|
||||||
|
if (th == ObjNull && isOptional) return
|
||||||
|
if (th !is ObjInstance) {
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (caller != null) {
|
||||||
|
val mangled = caller.mangledName(name)
|
||||||
|
th.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
writeDirectOrFallback(scope, th, rec, name, newValue, caller)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val key = th.objClass.publicMemberResolution[name] ?: name
|
||||||
|
th.fieldRecordForKey(key)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: th.objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name)) {
|
||||||
|
writeDirectOrFallback(scope, th, rec, name, newValue, decl)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
|
||||||
|
private suspend fun writeDirectOrFallback(
|
||||||
|
scope: Scope,
|
||||||
|
inst: ObjInstance,
|
||||||
|
rec: ObjRecord,
|
||||||
|
name: String,
|
||||||
|
newValue: Obj,
|
||||||
|
decl: ObjClass?
|
||||||
|
) {
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract) {
|
||||||
|
if (!rec.isMutable && rec.value !== ObjUnset) {
|
||||||
|
ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
||||||
|
}
|
||||||
|
if (rec.value.assign(scope, newValue) == null) rec.value = newValue
|
||||||
|
} else {
|
||||||
|
inst.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reference to index access (a[i]) with optional chaining.
|
* Reference to index access (a[i]) with optional chaining.
|
||||||
*/
|
*/
|
||||||
@@ -1133,7 +1559,7 @@ class IndexRef(
|
|||||||
/**
|
/**
|
||||||
* R-value reference that wraps a Statement (used during migration for expressions parsed as Statement).
|
* R-value reference that wraps a Statement (used during migration for expressions parsed as Statement).
|
||||||
*/
|
*/
|
||||||
class StatementRef(private val statement: Statement) : ObjRef {
|
class StatementRef(internal val statement: Statement) : ObjRef {
|
||||||
override suspend fun get(scope: Scope): ObjRecord = statement.execute(scope).asReadonly
|
override suspend fun get(scope: Scope): ObjRecord = statement.execute(scope).asReadonly
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1336,37 +1762,51 @@ class MethodCallRef(
|
|||||||
is ObjInstance -> {
|
is ObjInstance -> {
|
||||||
// Prefer resolved class member to avoid per-call lookup on hit
|
// Prefer resolved class member to avoid per-call lookup on hit
|
||||||
// BUT only if it's NOT a root object member (which can be shadowed by extensions)
|
// BUT only if it's NOT a root object member (which can be shadowed by extensions)
|
||||||
var hierarchyMember: ObjRecord? = null
|
|
||||||
val cls0 = base.objClass
|
val cls0 = base.objClass
|
||||||
val keyInScope = cls0.publicMemberResolution[name]
|
val keyInScope = cls0.publicMemberResolution[name]
|
||||||
if (keyInScope != null) {
|
val methodSlot = if (keyInScope != null) cls0.methodSlotForKey(keyInScope) else null
|
||||||
val rec = base.instanceScope.objects[keyInScope]
|
val fastRec = if (methodSlot != null) {
|
||||||
if (rec != null && rec.type == ObjRecord.Type.Fun) {
|
val idx = methodSlot.slot
|
||||||
hierarchyMember = rec
|
if (idx >= 0 && idx < base.methodSlots.size) base.methodSlots[idx] else null
|
||||||
}
|
} else if (keyInScope != null) {
|
||||||
}
|
base.methodRecordForKey(keyInScope) ?: base.instanceScope.objects[keyInScope]
|
||||||
|
} else null
|
||||||
|
val resolved = if (fastRec != null) null else cls0.resolveInstanceMember(name)
|
||||||
|
|
||||||
if (hierarchyMember == null) {
|
val targetRec = when {
|
||||||
for (cls in base.objClass.mro) {
|
fastRec != null && fastRec.type == ObjRecord.Type.Fun -> fastRec
|
||||||
if (cls.className == "Obj") break
|
resolved != null && resolved.record.type == ObjRecord.Type.Fun && !resolved.record.isAbstract -> resolved.record
|
||||||
val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
|
else -> null
|
||||||
if (rec != null && !rec.isAbstract && rec.type != ObjRecord.Type.Field) {
|
|
||||||
hierarchyMember = rec
|
|
||||||
break
|
|
||||||
}
|
}
|
||||||
}
|
if (targetRec != null) {
|
||||||
}
|
val visibility = targetRec.visibility
|
||||||
|
val decl = targetRec.declaringClass ?: (resolved?.declaringClass ?: cls0)
|
||||||
if (hierarchyMember != null) {
|
if (methodSlot != null && targetRec.type == ObjRecord.Type.Fun) {
|
||||||
val visibility = hierarchyMember.visibility
|
val slotIndex = methodSlot.slot
|
||||||
val callable = hierarchyMember.value
|
|
||||||
val decl = hierarchyMember.declaringClass ?: base.objClass
|
|
||||||
mKey1 = key; mVer1 = ver; mInvoker1 = { obj, sc, a ->
|
mKey1 = key; mVer1 = ver; mInvoker1 = { obj, sc, a ->
|
||||||
val inst = obj as ObjInstance
|
val inst = obj as ObjInstance
|
||||||
if (!visibility.isPublic && !canAccessMember(visibility, decl, sc.currentClassCtx))
|
if (inst.objClass === cls0) {
|
||||||
|
val rec = if (slotIndex >= 0 && slotIndex < inst.methodSlots.size) inst.methodSlots[slotIndex] else null
|
||||||
|
if (rec != null && rec.type == ObjRecord.Type.Fun && !rec.isAbstract) {
|
||||||
|
if (!visibility.isPublic && !canAccessMember(visibility, decl, sc.currentClassCtx, name))
|
||||||
|
sc.raiseError(ObjIllegalAccessException(sc, "can't invoke non-public method $name"))
|
||||||
|
rec.value.invoke(inst.instanceScope, inst, a, decl)
|
||||||
|
} else {
|
||||||
|
obj.invokeInstanceMethod(sc, name, a)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
obj.invokeInstanceMethod(sc, name, a)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
val callable = targetRec.value
|
||||||
|
mKey1 = key; mVer1 = ver; mInvoker1 = { obj, sc, a ->
|
||||||
|
val inst = obj as ObjInstance
|
||||||
|
if (!visibility.isPublic && !canAccessMember(visibility, decl, sc.currentClassCtx, name))
|
||||||
sc.raiseError(ObjIllegalAccessException(sc, "can't invoke non-public method $name"))
|
sc.raiseError(ObjIllegalAccessException(sc, "can't invoke non-public method $name"))
|
||||||
callable.invoke(inst.instanceScope, inst, a)
|
callable.invoke(inst.instanceScope, inst, a)
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
// Fallback to name-based lookup per call (handles extensions and root members)
|
// Fallback to name-based lookup per call (handles extensions and root members)
|
||||||
mKey1 = key; mVer1 = ver; mInvoker1 = { obj, sc, a -> obj.invokeInstanceMethod(sc, name, a) }
|
mKey1 = key; mVer1 = ver; mInvoker1 = { obj, sc, a -> obj.invokeInstanceMethod(sc, name, a) }
|
||||||
@@ -1399,6 +1839,57 @@ class MethodCallRef(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fast path for direct `this.method(...)` calls using slot maps.
|
||||||
|
* Falls back to normal invoke semantics when needed.
|
||||||
|
*/
|
||||||
|
class ThisMethodSlotCallRef(
|
||||||
|
private val name: String,
|
||||||
|
private val args: List<ParsedArgument>,
|
||||||
|
private val tailBlock: Boolean,
|
||||||
|
private val isOptional: Boolean
|
||||||
|
) : ObjRef {
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord = evalValue(scope).asReadonly
|
||||||
|
|
||||||
|
override suspend fun evalValue(scope: Scope): Obj {
|
||||||
|
val base = scope.thisObj
|
||||||
|
if (base == ObjNull && isOptional) return ObjNull
|
||||||
|
val callArgs = args.toArguments(scope, tailBlock)
|
||||||
|
if (base !is ObjInstance) return base.invokeInstanceMethod(scope, name, callArgs)
|
||||||
|
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
if (caller != null) {
|
||||||
|
val mangled = caller.mangledName(name)
|
||||||
|
base.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private && !rec.isAbstract) {
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (callArgs.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, base, caller)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(base.instanceScope, base, callArgs, caller)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val key = base.objClass.publicMemberResolution[name] ?: name
|
||||||
|
base.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: base.objClass.findDeclaringClassOf(name) ?: base.objClass
|
||||||
|
val effectiveCaller = caller ?: if (scope.thisObj === base) base.objClass else null
|
||||||
|
if (!canAccessMember(rec.visibility, decl, effectiveCaller, name))
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
|
||||||
|
if (rec.type == ObjRecord.Type.Property) {
|
||||||
|
if (callArgs.isEmpty()) return (rec.value as ObjProperty).callGetter(scope, base, decl)
|
||||||
|
} else if (rec.type == ObjRecord.Type.Fun) {
|
||||||
|
return rec.value.invoke(base.instanceScope, base, callArgs, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
return base.invokeInstanceMethod(scope, name, callArgs)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Reference to a local/visible variable by name (Phase A: scope lookup).
|
* Reference to a local/visible variable by name (Phase A: scope lookup).
|
||||||
*/
|
*/
|
||||||
@@ -1447,7 +1938,7 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
|
|||||||
val slot = if (hit) cachedSlot else resolveSlot(scope)
|
val slot = if (hit) cachedSlot else resolveSlot(scope)
|
||||||
if (slot >= 0) {
|
if (slot >= 0) {
|
||||||
val rec = scope.getSlotRecord(slot)
|
val rec = scope.getSlotRecord(slot)
|
||||||
if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
|
if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
// Not visible via slot, fallback to other lookups
|
// Not visible via slot, fallback to other lookups
|
||||||
} else {
|
} else {
|
||||||
if (PerfFlags.PIC_DEBUG_COUNTERS) {
|
if (PerfFlags.PIC_DEBUG_COUNTERS) {
|
||||||
@@ -1499,7 +1990,7 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
|
|||||||
val slot = if (cachedFrameId == scope.frameId && cachedSlot >= 0 && cachedSlot < scope.slotCount()) cachedSlot else resolveSlot(scope)
|
val slot = if (cachedFrameId == scope.frameId && cachedSlot >= 0 && cachedSlot < scope.slotCount()) cachedSlot else resolveSlot(scope)
|
||||||
if (slot >= 0) {
|
if (slot >= 0) {
|
||||||
val rec = scope.getSlotRecord(slot)
|
val rec = scope.getSlotRecord(slot)
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
scope.assign(rec, name, newValue)
|
scope.assign(rec, name, newValue)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -1608,7 +2099,7 @@ class FastLocalVarRef(
|
|||||||
val actualOwner = cachedOwnerScope
|
val actualOwner = cachedOwnerScope
|
||||||
if (slot >= 0 && actualOwner != null) {
|
if (slot >= 0 && actualOwner != null) {
|
||||||
val rec = actualOwner.getSlotRecord(slot)
|
val rec = actualOwner.getSlotRecord(slot)
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
if (PerfFlags.PIC_DEBUG_COUNTERS) {
|
if (PerfFlags.PIC_DEBUG_COUNTERS) {
|
||||||
if (ownerValid) PerfStats.fastLocalHit++ else PerfStats.fastLocalMiss++
|
if (ownerValid) PerfStats.fastLocalHit++ else PerfStats.fastLocalMiss++
|
||||||
}
|
}
|
||||||
@@ -1652,7 +2143,7 @@ class FastLocalVarRef(
|
|||||||
val actualOwner = cachedOwnerScope
|
val actualOwner = cachedOwnerScope
|
||||||
if (slot >= 0 && actualOwner != null) {
|
if (slot >= 0 && actualOwner != null) {
|
||||||
val rec = actualOwner.getSlotRecord(slot)
|
val rec = actualOwner.getSlotRecord(slot)
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
return scope.resolve(rec, name)
|
return scope.resolve(rec, name)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -1698,7 +2189,7 @@ class FastLocalVarRef(
|
|||||||
val actualOwner = cachedOwnerScope
|
val actualOwner = cachedOwnerScope
|
||||||
if (slot >= 0 && actualOwner != null) {
|
if (slot >= 0 && actualOwner != null) {
|
||||||
val rec = actualOwner.getSlotRecord(slot)
|
val rec = actualOwner.getSlotRecord(slot)
|
||||||
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
|
if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
scope.assign(rec, name, newValue)
|
scope.assign(rec, name, newValue)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -1729,6 +2220,274 @@ class FastLocalVarRef(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Identifier reference in class context that prefers member slots on `this` after local lookup.
|
||||||
|
* Falls back to normal scope lookup for globals/outer scopes.
|
||||||
|
*/
|
||||||
|
class ImplicitThisMemberRef(
|
||||||
|
val name: String,
|
||||||
|
val atPos: Pos
|
||||||
|
) : ObjRef {
|
||||||
|
private fun resolveInstanceFieldRecord(th: ObjInstance, caller: ObjClass?): ObjRecord? {
|
||||||
|
if (caller == null) return null
|
||||||
|
for (cls in th.objClass.mro) {
|
||||||
|
if (cls.className == "Obj") break
|
||||||
|
val rec = cls.members[name] ?: continue
|
||||||
|
if (rec.isAbstract) continue
|
||||||
|
val decl = rec.declaringClass ?: cls
|
||||||
|
if (!canAccessMember(rec.visibility, decl, caller, name)) continue
|
||||||
|
val key = decl.mangledName(name)
|
||||||
|
th.fieldRecordForKey(key)?.let { return it }
|
||||||
|
th.instanceScope.objects[key]?.let { return it }
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun forEachVariable(block: (String) -> Unit) {
|
||||||
|
block(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun forEachVariableWithPos(block: (String, Pos) -> Unit) {
|
||||||
|
block(name, atPos)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord {
|
||||||
|
scope.pos = atPos
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
val th = scope.thisObj
|
||||||
|
|
||||||
|
// 1) locals in the same `this` chain
|
||||||
|
var s: Scope? = scope
|
||||||
|
while (s != null && s.thisObj === th) {
|
||||||
|
scope.tryGetLocalRecord(s, name, caller)?.let { return it }
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) member slots on this instance
|
||||||
|
if (th is ObjInstance) {
|
||||||
|
// private member access for current class context
|
||||||
|
caller?.let { c ->
|
||||||
|
val mangled = c.mangledName(name)
|
||||||
|
th.fieldRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return th.resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(mangled)?.let { rec ->
|
||||||
|
if (rec.visibility == Visibility.Private) {
|
||||||
|
return th.resolveRecord(scope, rec, name, c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resolveInstanceFieldRecord(th, caller)?.let { return it }
|
||||||
|
|
||||||
|
val key = th.objClass.publicMemberResolution[name] ?: name
|
||||||
|
th.fieldRecordForKey(key)?.let { rec ->
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract)
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (!rec.isAbstract) {
|
||||||
|
val decl = rec.declaringClass ?: th.objClass.findDeclaringClassOf(name) ?: th.objClass
|
||||||
|
return th.resolveRecord(scope, rec, name, decl)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3) fallback to normal scope resolution (globals/outer scopes)
|
||||||
|
scope[name]?.let { return it }
|
||||||
|
try {
|
||||||
|
return th.readField(scope, name)
|
||||||
|
} catch (e: ExecutionError) {
|
||||||
|
if ((e.message ?: "").contains("no such field: $name")) scope.raiseSymbolNotFound(name)
|
||||||
|
throw e
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun evalValue(scope: Scope): Obj {
|
||||||
|
val rec = get(scope)
|
||||||
|
return scope.resolve(rec, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setAt(pos: Pos, scope: Scope, newValue: Obj) {
|
||||||
|
scope.pos = atPos
|
||||||
|
val caller = scope.currentClassCtx
|
||||||
|
val th = scope.thisObj
|
||||||
|
|
||||||
|
// 1) locals in the same `this` chain
|
||||||
|
var s: Scope? = scope
|
||||||
|
while (s != null && s.thisObj === th) {
|
||||||
|
val rec = scope.tryGetLocalRecord(s, name, caller)
|
||||||
|
if (rec != null) {
|
||||||
|
scope.assign(rec, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
s = s.parent
|
||||||
|
}
|
||||||
|
|
||||||
|
// 2) member slots on this instance
|
||||||
|
if (th is ObjInstance) {
|
||||||
|
val key = th.objClass.publicMemberResolution[name] ?: name
|
||||||
|
th.fieldRecordForKey(key)?.let { rec ->
|
||||||
|
val decl = rec.declaringClass ?: th.objClass.findDeclaringClassOf(name)
|
||||||
|
if (canAccessMember(rec.effectiveWriteVisibility, decl, caller, name)) {
|
||||||
|
if ((rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.ConstructorField) && !rec.isAbstract) {
|
||||||
|
if (!rec.isMutable && rec.value !== ObjUnset) {
|
||||||
|
ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
|
||||||
|
}
|
||||||
|
if (rec.value.assign(scope, newValue) == null) rec.value = newValue
|
||||||
|
} else {
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
th.methodRecordForKey(key)?.let { rec ->
|
||||||
|
if (rec.effectiveWriteVisibility == Visibility.Public &&
|
||||||
|
(rec.type == ObjRecord.Type.Property || rec.type == ObjRecord.Type.Delegated)) {
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
resolveInstanceFieldRecord(th, caller)?.let { rec ->
|
||||||
|
scope.assign(rec, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// 3) fallback to normal scope resolution
|
||||||
|
scope[name]?.let { stored ->
|
||||||
|
scope.assign(stored, name, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
th.writeField(scope, name, newValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Fast path for implicit member calls in class bodies: `foo(...)` resolves locals first,
|
||||||
|
* then falls back to member lookup on `this`.
|
||||||
|
*/
|
||||||
|
class ImplicitThisMethodCallRef(
|
||||||
|
private val name: String,
|
||||||
|
private val args: List<ParsedArgument>,
|
||||||
|
private val tailBlock: Boolean,
|
||||||
|
private val isOptional: Boolean,
|
||||||
|
private val atPos: Pos
|
||||||
|
) : ObjRef {
|
||||||
|
private val memberRef = ImplicitThisMemberRef(name, atPos)
|
||||||
|
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord = evalValue(scope).asReadonly
|
||||||
|
|
||||||
|
override suspend fun evalValue(scope: Scope): Obj {
|
||||||
|
scope.pos = atPos
|
||||||
|
val callee = memberRef.evalValue(scope)
|
||||||
|
if (callee == ObjNull && isOptional) return ObjNull
|
||||||
|
val callArgs = args.toArguments(scope, tailBlock)
|
||||||
|
val usePool = PerfFlags.SCOPE_POOL
|
||||||
|
return if (usePool) {
|
||||||
|
scope.withChildFrame(callArgs) { child ->
|
||||||
|
callee.callOn(child)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
callee.callOn(scope.createChildScope(scope.pos, callArgs))
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Direct local slot reference with known slot index and lexical depth.
|
||||||
|
* Depth=0 means current scope, depth=1 means parent scope, etc.
|
||||||
|
*/
|
||||||
|
class LocalSlotRef(
|
||||||
|
val name: String,
|
||||||
|
private val slot: Int,
|
||||||
|
private val depth: Int,
|
||||||
|
private val atPos: Pos,
|
||||||
|
) : ObjRef {
|
||||||
|
override fun forEachVariable(block: (String) -> Unit) {
|
||||||
|
block(name)
|
||||||
|
}
|
||||||
|
|
||||||
|
private val fallbackRef = LocalVarRef(name, atPos)
|
||||||
|
private var cachedFrameId: Long = 0L
|
||||||
|
private var cachedOwner: Scope? = null
|
||||||
|
private var cachedOwnerVerified: Boolean = false
|
||||||
|
|
||||||
|
private fun resolveOwner(scope: Scope): Scope? {
|
||||||
|
if (cachedOwner != null && cachedFrameId == scope.frameId && cachedOwnerVerified) {
|
||||||
|
val cached = cachedOwner!!
|
||||||
|
val candidate = if (depth == 0) scope else {
|
||||||
|
var s: Scope? = scope
|
||||||
|
var remaining = depth
|
||||||
|
while (s != null && remaining > 0) {
|
||||||
|
s = s.parent
|
||||||
|
remaining--
|
||||||
|
}
|
||||||
|
s
|
||||||
|
}
|
||||||
|
if (candidate === cached && candidate?.getSlotIndexOf(name) == slot) return cached
|
||||||
|
}
|
||||||
|
var s: Scope? = scope
|
||||||
|
var remaining = depth
|
||||||
|
while (s != null && remaining > 0) {
|
||||||
|
s = s.parent
|
||||||
|
remaining--
|
||||||
|
}
|
||||||
|
if (s == null || s.getSlotIndexOf(name) != slot) {
|
||||||
|
cachedOwner = null
|
||||||
|
cachedOwnerVerified = false
|
||||||
|
cachedFrameId = scope.frameId
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
cachedOwner = s
|
||||||
|
cachedOwnerVerified = true
|
||||||
|
cachedFrameId = scope.frameId
|
||||||
|
return s
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun get(scope: Scope): ObjRecord {
|
||||||
|
scope.pos = atPos
|
||||||
|
val owner = resolveOwner(scope) ?: return fallbackRef.get(scope)
|
||||||
|
if (slot < 0 || slot >= owner.slotCount()) return fallbackRef.get(scope)
|
||||||
|
val rec = owner.getSlotRecord(slot)
|
||||||
|
if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "private field access"))
|
||||||
|
}
|
||||||
|
return rec
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun evalValue(scope: Scope): Obj {
|
||||||
|
scope.pos = atPos
|
||||||
|
val owner = resolveOwner(scope) ?: return fallbackRef.evalValue(scope)
|
||||||
|
if (slot < 0 || slot >= owner.slotCount()) return fallbackRef.evalValue(scope)
|
||||||
|
val rec = owner.getSlotRecord(slot)
|
||||||
|
if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "private field access"))
|
||||||
|
}
|
||||||
|
return scope.resolve(rec, name)
|
||||||
|
}
|
||||||
|
|
||||||
|
override suspend fun setAt(pos: Pos, scope: Scope, newValue: Obj) {
|
||||||
|
scope.pos = atPos
|
||||||
|
val owner = resolveOwner(scope) ?: run {
|
||||||
|
fallbackRef.setAt(pos, scope, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if (slot < 0 || slot >= owner.slotCount()) {
|
||||||
|
fallbackRef.setAt(pos, scope, newValue)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
val rec = owner.getSlotRecord(slot)
|
||||||
|
if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx, name)) {
|
||||||
|
scope.raiseError(ObjIllegalAccessException(scope, "private field access"))
|
||||||
|
}
|
||||||
|
scope.assign(rec, name, newValue)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
class ListLiteralRef(private val entries: List<ListEntry>) : ObjRef {
|
class ListLiteralRef(private val entries: List<ListEntry>) : ObjRef {
|
||||||
override fun forEachVariable(block: (String) -> Unit) {
|
override fun forEachVariable(block: (String) -> Unit) {
|
||||||
for (e in entries) {
|
for (e in entries) {
|
||||||
@@ -1862,9 +2621,9 @@ class MapLiteralRef(private val entries: List<MapLiteralEntry>) : ObjRef {
|
|||||||
* Range literal: left .. right or left ..< right. Right may be omitted in certain contexts.
|
* Range literal: left .. right or left ..< right. Right may be omitted in certain contexts.
|
||||||
*/
|
*/
|
||||||
class RangeRef(
|
class RangeRef(
|
||||||
private val left: ObjRef?,
|
internal val left: ObjRef?,
|
||||||
private val right: ObjRef?,
|
internal val right: ObjRef?,
|
||||||
private val isEndInclusive: Boolean
|
internal val isEndInclusive: Boolean
|
||||||
) : ObjRef {
|
) : ObjRef {
|
||||||
override suspend fun get(scope: Scope): ObjRecord {
|
override suspend fun get(scope: Scope): ObjRecord {
|
||||||
return evalValue(scope).asReadonly
|
return evalValue(scope).asReadonly
|
||||||
@@ -1910,7 +2669,15 @@ class AssignRef(
|
|||||||
val v = value.evalValue(scope)
|
val v = value.evalValue(scope)
|
||||||
// For properties, we should not call get() on target because it invokes the getter.
|
// For properties, we should not call get() on target because it invokes the getter.
|
||||||
// Instead, we call setAt directly.
|
// Instead, we call setAt directly.
|
||||||
if (target is FieldRef || target is IndexRef || target is LocalVarRef || target is FastLocalVarRef || target is BoundLocalVarRef) {
|
if (target is FieldRef ||
|
||||||
|
target is IndexRef ||
|
||||||
|
target is LocalVarRef ||
|
||||||
|
target is FastLocalVarRef ||
|
||||||
|
target is BoundLocalVarRef ||
|
||||||
|
target is LocalSlotRef ||
|
||||||
|
target is ThisFieldSlotRef ||
|
||||||
|
target is QualifiedThisFieldSlotRef ||
|
||||||
|
target is ImplicitThisMemberRef) {
|
||||||
target.setAt(atPos, scope, v)
|
target.setAt(atPos, scope, v)
|
||||||
} else {
|
} else {
|
||||||
val rec = target.get(scope)
|
val rec = target.get(scope)
|
||||||
|
|||||||
@@ -79,6 +79,14 @@ data class ObjString(val value: String) : Obj() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
override suspend fun mul(scope: Scope, other: Obj): Obj {
|
||||||
|
var times = other.toInt()
|
||||||
|
if( times < 0 ) scope.raiseIllegalArgument("negative string repetitions")
|
||||||
|
return ObjString( buildString {
|
||||||
|
while( times-- > 0 ) append(value)
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
override fun hashCode(): Int {
|
override fun hashCode(): Int {
|
||||||
return value.hashCode()
|
return value.hashCode()
|
||||||
}
|
}
|
||||||
@@ -293,6 +301,18 @@ data class ObjString(val value: String) : Obj() {
|
|||||||
) {
|
) {
|
||||||
thisAs<ObjString>().value.trim().let(::ObjString)
|
thisAs<ObjString>().value.trim().let(::ObjString)
|
||||||
}
|
}
|
||||||
|
addFnDoc("isBlank", "Whether this string is empty or contains only whitespace characters.",
|
||||||
|
returns = type("lyng.Bool"), moduleName = "lyng.stdlib") {
|
||||||
|
ObjBool(thisAs<ObjString>().value.isBlank())
|
||||||
|
}
|
||||||
|
addFnDoc("isEmpty", "Whether this string is empty.",
|
||||||
|
returns = type("lyng.Bool"), moduleName = "lyng.stdlib") {
|
||||||
|
ObjBool(thisAs<ObjString>().value.isEmpty())
|
||||||
|
}
|
||||||
|
addFnDoc("isNotEmpty", "Whether this string is not empty.",
|
||||||
|
returns = type("lyng.Bool"), moduleName = "lyng.stdlib") {
|
||||||
|
ObjBool(thisAs<ObjString>().value.isNotEmpty())
|
||||||
|
}
|
||||||
addFnDoc(
|
addFnDoc(
|
||||||
name = "matches",
|
name = "matches",
|
||||||
doc = "Whether this string matches the given regular expression or pattern string.",
|
doc = "Whether this string matches the given regular expression or pattern string.",
|
||||||
|
|||||||
@@ -63,6 +63,13 @@ abstract class Statement(
|
|||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
class ExpressionStatement(
|
||||||
|
val ref: net.sergeych.lyng.obj.ObjRef,
|
||||||
|
override val pos: Pos
|
||||||
|
) : Statement() {
|
||||||
|
override suspend fun execute(scope: Scope): Obj = ref.evalValue(scope)
|
||||||
|
}
|
||||||
|
|
||||||
fun Statement.raise(text: String): Nothing {
|
fun Statement.raise(text: String): Nothing {
|
||||||
throw ScriptError(pos, text)
|
throw ScriptError(pos, text)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,5 +1,5 @@
|
|||||||
/*
|
/*
|
||||||
* Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
*
|
*
|
||||||
* Licensed under the Apache License, Version 2.0 (the "License");
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
* you may not use this file except in compliance with the License.
|
* you may not use this file except in compliance with the License.
|
||||||
@@ -20,6 +20,7 @@ package net.sergeych.lynon
|
|||||||
import net.sergeych.lyng.Scope
|
import net.sergeych.lyng.Scope
|
||||||
import net.sergeych.lyng.obj.Obj
|
import net.sergeych.lyng.obj.Obj
|
||||||
import net.sergeych.lyng.obj.ObjClass
|
import net.sergeych.lyng.obj.ObjClass
|
||||||
|
import net.sergeych.lyng.obj.ObjInstance
|
||||||
import net.sergeych.lyng.obj.ObjString
|
import net.sergeych.lyng.obj.ObjString
|
||||||
|
|
||||||
open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSettings.default) {
|
open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSettings.default) {
|
||||||
@@ -79,15 +80,16 @@ open class LynonDecoder(val bin: BitInput, val settings: LynonSettings = LynonSe
|
|||||||
private suspend fun decodeClassObj(scope: Scope): ObjClass {
|
private suspend fun decodeClassObj(scope: Scope): ObjClass {
|
||||||
val className = decodeObject(scope, ObjString.type, null) as ObjString
|
val className = decodeObject(scope, ObjString.type, null) as ObjString
|
||||||
return scope.get(className.value)?.value?.let {
|
return scope.get(className.value)?.value?.let {
|
||||||
if (it !is ObjClass)
|
if (it is ObjClass) return it
|
||||||
|
if (it is ObjInstance && it.objClass.className == className.value) return it.objClass
|
||||||
scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}")
|
scope.raiseClassCastError("Expected obj class but got ${it::class.simpleName}")
|
||||||
it
|
|
||||||
} ?: run {
|
} ?: run {
|
||||||
// Use Scope API that mirrors compiler-emitted ObjRef chain for qualified identifiers
|
// Use Scope API that mirrors compiler-emitted ObjRef chain for qualified identifiers
|
||||||
val evaluated = scope.resolveQualifiedIdentifier(className.value)
|
val evaluated = scope.resolveQualifiedIdentifier(className.value)
|
||||||
if (evaluated !is ObjClass)
|
if (evaluated is ObjClass) return evaluated
|
||||||
|
if (evaluated is ObjInstance && evaluated.objClass.className == className.value) return evaluated.objClass
|
||||||
scope.raiseClassCastError("Expected obj class but got ${evaluated::class.simpleName}")
|
scope.raiseClassCastError("Expected obj class but got ${evaluated::class.simpleName}")
|
||||||
evaluated
|
evaluated as ObjClass // unreachable but for compiler
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -168,6 +168,7 @@ class MiniAstTest {
|
|||||||
assertNotNull(ed.doc)
|
assertNotNull(ed.doc)
|
||||||
assertTrue(ed.doc.raw.contains("Enum E docs"))
|
assertTrue(ed.doc.raw.contains("Enum E docs"))
|
||||||
assertEquals(listOf("A", "B", "C"), ed.entries)
|
assertEquals(listOf("A", "B", "C"), ed.entries)
|
||||||
|
assertEquals(3, ed.entryPositions.size)
|
||||||
assertEquals("E", ed.name)
|
assertEquals("E", ed.name)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -473,4 +474,106 @@ class MiniAstTest {
|
|||||||
assertEquals("a", fn.params[0].name)
|
assertEquals("a", fn.params[0].name)
|
||||||
assertEquals("b", fn.params[1].name)
|
assertEquals("b", fn.params[1].name)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun miniAst_captures_dokka_tags() = runTest {
|
||||||
|
val code = """
|
||||||
|
/**
|
||||||
|
* Testing tags.
|
||||||
|
* @param x the x value
|
||||||
|
* @param y the y value
|
||||||
|
* @return some string
|
||||||
|
* @throws Exception if failed
|
||||||
|
*/
|
||||||
|
fun tagged(x: Int, y: Int): String { "" }
|
||||||
|
""".trimIndent()
|
||||||
|
val (_, sink) = compileWithMini(code)
|
||||||
|
val mini = sink.build()
|
||||||
|
assertNotNull(mini)
|
||||||
|
val fn = mini.declarations.filterIsInstance<MiniFunDecl>().firstOrNull { it.name == "tagged" }
|
||||||
|
assertNotNull(fn)
|
||||||
|
val doc = fn.doc
|
||||||
|
assertNotNull(doc)
|
||||||
|
assertEquals("Testing tags.", doc.summary)
|
||||||
|
|
||||||
|
val tags = doc.tags
|
||||||
|
assertTrue(tags.containsKey("param"), "should have @param tags")
|
||||||
|
assertEquals(listOf("x the x value", "y the y value"), tags["param"])
|
||||||
|
assertEquals(listOf("some string"), tags["return"])
|
||||||
|
assertEquals(listOf("Exception if failed"), tags["throws"])
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun miniAst_captures_multiline_tags() = runTest {
|
||||||
|
val code = """
|
||||||
|
/**
|
||||||
|
* Multi line tag.
|
||||||
|
* @param x first line of x
|
||||||
|
* second line of x
|
||||||
|
* @return return value
|
||||||
|
*/
|
||||||
|
fun multiline(x: Int): Int { 0 }
|
||||||
|
""".trimIndent()
|
||||||
|
val (_, sink) = compileWithMini(code)
|
||||||
|
val mini = sink.build()
|
||||||
|
assertNotNull(mini)
|
||||||
|
val fn = mini.declarations.filterIsInstance<MiniFunDecl>().firstOrNull { it.name == "multiline" }
|
||||||
|
assertNotNull(fn)
|
||||||
|
val doc = fn.doc
|
||||||
|
assertNotNull(doc)
|
||||||
|
|
||||||
|
val tags = doc.tags
|
||||||
|
assertTrue(tags.containsKey("param"), "should have @param tags")
|
||||||
|
val xParam = tags["param"]?.first() ?: ""
|
||||||
|
assertTrue(xParam.contains("first line of x"), "should contain first line")
|
||||||
|
assertTrue(xParam.contains("second line of x"), "should contain second line")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun enum_minidocs_and_semicolon_robustness() = runTest {
|
||||||
|
val code = """
|
||||||
|
/** Enum doc */
|
||||||
|
enum E { A };
|
||||||
|
|
||||||
|
/** Next doc */
|
||||||
|
class C {}
|
||||||
|
""".trimIndent()
|
||||||
|
val (_, sink) = compileWithMini(code)
|
||||||
|
val mini = sink.build()
|
||||||
|
assertNotNull(mini)
|
||||||
|
|
||||||
|
val en = mini.declarations.filterIsInstance<MiniEnumDecl>().firstOrNull { it.name == "E" }
|
||||||
|
assertNotNull(en)
|
||||||
|
assertNotNull(en.doc)
|
||||||
|
assertEquals("Enum doc", en.doc.summary)
|
||||||
|
|
||||||
|
val cl = mini.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "C" }
|
||||||
|
assertNotNull(cl)
|
||||||
|
assertNotNull(cl.doc)
|
||||||
|
assertEquals("Next doc", cl.doc.summary)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun empty_enum_support() = runTest {
|
||||||
|
val code = "enum E {}"
|
||||||
|
val (_, sink) = compileWithMini(code)
|
||||||
|
val mini = sink.build()
|
||||||
|
assertNotNull(mini)
|
||||||
|
assertTrue(mini.declarations.any { it.name == "E" && it is MiniEnumDecl })
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun modifiers_with_comment_robustness() = runTest {
|
||||||
|
val code = """
|
||||||
|
class X {
|
||||||
|
static /** doc */ fun f() {}
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
val (_, sink) = compileWithMini(code)
|
||||||
|
val mini = sink.build()
|
||||||
|
assertNotNull(mini)
|
||||||
|
val cls = mini.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "X" }
|
||||||
|
assertNotNull(cls)
|
||||||
|
assertTrue(cls.members.any { it.name == "f" })
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
|
import net.sergeych.lyng.Benchmarks
|
||||||
|
import net.sergeych.lyng.eval
|
||||||
|
import net.sergeych.lyng.obj.ObjInt
|
||||||
|
import kotlin.time.TimeSource
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertEquals
|
||||||
|
|
||||||
|
class NestedRangeBenchmarkTest {
|
||||||
|
@Test
|
||||||
|
fun benchmarkHappyNumbersNestedRanges() = runTest {
|
||||||
|
if (!Benchmarks.enabled) return@runTest
|
||||||
|
val script = """
|
||||||
|
fun naiveCountHappyNumbers() {
|
||||||
|
var count = 0
|
||||||
|
for( n1 in 0..9 )
|
||||||
|
for( n2 in 0..9 )
|
||||||
|
for( n3 in 0..9 )
|
||||||
|
for( n4 in 0..9 )
|
||||||
|
for( n5 in 0..9 )
|
||||||
|
for( n6 in 0..9 )
|
||||||
|
if( n1 + n2 + n3 == n4 + n5 + n6 ) count++
|
||||||
|
count
|
||||||
|
}
|
||||||
|
naiveCountHappyNumbers()
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val start = TimeSource.Monotonic.markNow()
|
||||||
|
val result = eval(script) as ObjInt
|
||||||
|
val elapsedMs = start.elapsedNow().inWholeMilliseconds
|
||||||
|
println("[DEBUG_LOG] [BENCH] nested-happy elapsed=${elapsedMs} ms")
|
||||||
|
assertEquals(55252L, result.value)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -17,6 +17,7 @@
|
|||||||
|
|
||||||
import kotlinx.coroutines.test.runTest
|
import kotlinx.coroutines.test.runTest
|
||||||
import net.sergeych.lyng.Script
|
import net.sergeych.lyng.Script
|
||||||
|
import net.sergeych.lyng.Statement
|
||||||
import net.sergeych.lyng.eval
|
import net.sergeych.lyng.eval
|
||||||
import net.sergeych.lyng.obj.ObjInstance
|
import net.sergeych.lyng.obj.ObjInstance
|
||||||
import net.sergeych.lyng.obj.ObjList
|
import net.sergeych.lyng.obj.ObjList
|
||||||
@@ -776,4 +777,153 @@ class OOTest {
|
|||||||
|
|
||||||
assertEquals("success", result.toString(), "Parameter 'id' should shadow method 'id' in block")
|
assertEquals("success", result.toString(), "Parameter 'id' should shadow method 'id' in block")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testOverrideVisibilityRules1() = runTest {
|
||||||
|
val scope = Script.newScope()
|
||||||
|
scope.eval("""
|
||||||
|
interface Base {
|
||||||
|
abstract protected fun foo()
|
||||||
|
|
||||||
|
fun bar() {
|
||||||
|
// it must see foo() as it is protected and
|
||||||
|
// is declared here (even as abstract):
|
||||||
|
foo()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
class Derived : Base {
|
||||||
|
protected val suffix = "!"
|
||||||
|
|
||||||
|
private fun fooPrivateImpl() = "bar"
|
||||||
|
|
||||||
|
override protected fun foo() {
|
||||||
|
// it should access own private and all protected memberes here:
|
||||||
|
fooPrivateImpl() + suffix
|
||||||
|
}
|
||||||
|
}
|
||||||
|
class Derived2: Base {
|
||||||
|
private var value = 42
|
||||||
|
|
||||||
|
private fun fooPrivateImpl() = value
|
||||||
|
|
||||||
|
override protected fun foo() {
|
||||||
|
fooPrivateImpl()
|
||||||
|
value++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assertEquals("bar!", Derived().bar())
|
||||||
|
val d = Derived2()
|
||||||
|
assertEquals(42, d.bar())
|
||||||
|
assertEquals(43, d.bar())
|
||||||
|
""".trimIndent())
|
||||||
|
scope.createChildScope().eval("""
|
||||||
|
assertEquals("bar!", Derived().bar())
|
||||||
|
assertEquals(42, Derived2().bar())
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
fun testOverrideVisibilityRules2() = runTest {
|
||||||
|
val scope = Script.newScope()
|
||||||
|
val fn = scope.eval("""
|
||||||
|
interface Base {
|
||||||
|
abstract fun foo()
|
||||||
|
|
||||||
|
fun bar() {
|
||||||
|
// it must see foo() as it is protected and
|
||||||
|
// is declared here (even as abstract):
|
||||||
|
foo()
|
||||||
|
}
|
||||||
|
}
|
||||||
|
class Derived : Base {
|
||||||
|
protected val suffix = "!"
|
||||||
|
|
||||||
|
private fun fooPrivateImpl() = "bar"
|
||||||
|
|
||||||
|
override fun foo() {
|
||||||
|
// it should access own private and all protected memberes here:
|
||||||
|
fooPrivateImpl() + suffix
|
||||||
|
}
|
||||||
|
}
|
||||||
|
class Derived2: Base {
|
||||||
|
private var value = 42
|
||||||
|
|
||||||
|
private fun fooPrivateImpl() = value
|
||||||
|
|
||||||
|
override fun foo() {
|
||||||
|
fooPrivateImpl()
|
||||||
|
value++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
assertEquals("bar!", Derived().bar())
|
||||||
|
val d = Derived2()
|
||||||
|
|
||||||
|
fun callBar() = d.bar()
|
||||||
|
|
||||||
|
assertEquals(42, callBar())
|
||||||
|
assertEquals(43, callBar())
|
||||||
|
|
||||||
|
callBar
|
||||||
|
""".trimIndent()) as Statement
|
||||||
|
val s2 = Script.newScope()
|
||||||
|
assertEquals(44L, fn.invoke(scope, fn).toKotlin(s2))
|
||||||
|
assertEquals(45L, fn.invoke(s2, fn).toKotlin(s2))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testToStringWithTransients() = runTest {
|
||||||
|
eval("""
|
||||||
|
class C(amount,@Transient transient=0) {
|
||||||
|
val l by lazy { transient + amount }
|
||||||
|
fun lock() {
|
||||||
|
if( transient < 10 )
|
||||||
|
C(amount).also { it.transient = transient + 10 }
|
||||||
|
else
|
||||||
|
this
|
||||||
|
}
|
||||||
|
}
|
||||||
|
println(C(1))
|
||||||
|
println(C(1).lock().amount)
|
||||||
|
println(C(1).lock().lock().amount)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
fun testToStringWithTransient() = runTest {
|
||||||
|
eval("""
|
||||||
|
class C(amount,@Transient transient=0) {
|
||||||
|
val l by lazy { transient + amount }
|
||||||
|
fun lock() {
|
||||||
|
if( transient < 10 )
|
||||||
|
C(amount).also { it.transient = transient + 10 }
|
||||||
|
else
|
||||||
|
this
|
||||||
|
}
|
||||||
|
}
|
||||||
|
println(C(1))
|
||||||
|
println(C(1).lock().amount)
|
||||||
|
println(C(1).lock().lock().amount)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testToJsonString() = runTest {
|
||||||
|
eval("""
|
||||||
|
class T(a,b,@Transient c=0)
|
||||||
|
assertEquals("{\"a\":\"foo\",\"b\":\"bar\"}",T("foo", "bar").toJsonString())
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testAssignToUnqualifiedParams() = runTest {
|
||||||
|
eval("""
|
||||||
|
class T(x) {
|
||||||
|
fun setx(v) { x = v }
|
||||||
|
fun incr(v) { x += v }
|
||||||
|
}
|
||||||
|
val t = T(1)
|
||||||
|
t.setx(2)
|
||||||
|
assertEquals(2, t.x)
|
||||||
|
t.incr(3)
|
||||||
|
assertEquals(5, t.x)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
@@ -3169,6 +3169,19 @@ class ScriptTest {
|
|||||||
assertEquals( n1 - now, 7.seconds )
|
assertEquals( n1 - now, 7.seconds )
|
||||||
assertEquals( now - n1, -7.seconds )
|
assertEquals( now - n1, -7.seconds )
|
||||||
|
|
||||||
|
val t3 = Instant("2024-01-01T12:00:00.123456Z")
|
||||||
|
val t4 = t3.truncateToMinute
|
||||||
|
assertEquals(t4.toRFC3339(), "2024-01-01T12:00:00Z")
|
||||||
|
assertEquals(
|
||||||
|
"2024-01-01T12:00:00Z",
|
||||||
|
Instant("2024-01-01T12:00:59.999Z").truncateToMinute().toRFC3339()
|
||||||
|
)
|
||||||
|
|
||||||
|
val t5 = t3.truncateToSecond
|
||||||
|
assertEquals(t5.toRFC3339(), "2024-01-01T12:00:00Z")
|
||||||
|
|
||||||
|
val t6 = t3.truncateToMillisecond
|
||||||
|
assertEquals(t6.toRFC3339(), "2024-01-01T12:00:00.123Z")
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
)
|
)
|
||||||
delay(1000)
|
delay(1000)
|
||||||
@@ -3209,6 +3222,137 @@ class ScriptTest {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testDateTimeComprehensive() = runTest {
|
||||||
|
eval("""
|
||||||
|
import lyng.time
|
||||||
|
import lyng.serialization
|
||||||
|
|
||||||
|
// 1. Timezone variations
|
||||||
|
val t1 = Instant("2024-01-01T12:00:00Z")
|
||||||
|
|
||||||
|
val dtZ = t1.toDateTime("Z")
|
||||||
|
assertEquals(dtZ.timeZone, "Z")
|
||||||
|
assertEquals(dtZ.hour, 12)
|
||||||
|
|
||||||
|
val dtP2 = t1.toDateTime("+02:00")
|
||||||
|
assertEquals(dtP2.timeZone, "+02:00")
|
||||||
|
assertEquals(dtP2.hour, 14)
|
||||||
|
|
||||||
|
val dtM330 = t1.toDateTime("-03:30")
|
||||||
|
assertEquals(dtM330.timeZone, "-03:30")
|
||||||
|
assertEquals(dtM330.hour, 8)
|
||||||
|
assertEquals(dtM330.minute, 30)
|
||||||
|
|
||||||
|
// 2. RFC3339 representations
|
||||||
|
// Note: ObjDateTime.toString() currently uses localDateTime.toString() + timeZone.toString()
|
||||||
|
// We should verify what it actually produces.
|
||||||
|
val s1 = dtP2.toRFC3339()
|
||||||
|
// kotlinx-datetime LocalDateTime.toString() is ISO8601
|
||||||
|
// TimeZone.toString() for offsets is usually the offset string itself
|
||||||
|
println("dtP2 RFC3339: " + s1)
|
||||||
|
|
||||||
|
// 3. Parsing
|
||||||
|
val t2 = Instant("2024-02-29T10:00:00+01:00")
|
||||||
|
assertEquals(t2.toDateTime("Z").hour, 9)
|
||||||
|
|
||||||
|
// val dt3 = DateTime(t1, "Europe/Prague")
|
||||||
|
// assertEquals(dt3.timeZone, "Europe/Prague")
|
||||||
|
|
||||||
|
// 4. Serialization (Lynon)
|
||||||
|
val bin = Lynon.encode(dtP2)
|
||||||
|
val dtP2_dec = Lynon.decode(bin)
|
||||||
|
assertEquals(dtP2, dtP2_dec)
|
||||||
|
assertEquals(dtP2_dec.hour, 14)
|
||||||
|
assertEquals(dtP2_dec.timeZone, "+02:00")
|
||||||
|
|
||||||
|
// 5. Serialization (JSON)
|
||||||
|
// val json = Lynon.toJson(dtM330) // toJson is not on Lynon yet
|
||||||
|
// println("JSON: " + json)
|
||||||
|
|
||||||
|
// 6. Arithmetic edge cases
|
||||||
|
val leapDay = Instant("2024-02-29T12:00:00Z").toDateTime("Z")
|
||||||
|
val nextYear = leapDay.addYears(1)
|
||||||
|
assertEquals(nextYear.year, 2025)
|
||||||
|
assertEquals(nextYear.month, 2)
|
||||||
|
assertEquals(nextYear.day, 28) // Normalized
|
||||||
|
|
||||||
|
val monthEnd = Instant("2024-01-31T12:00:00Z").toDateTime("Z")
|
||||||
|
val nextMonth = monthEnd.addMonths(1)
|
||||||
|
assertEquals(nextMonth.month, 2)
|
||||||
|
assertEquals(nextMonth.day, 29) // 2024 is leap year
|
||||||
|
|
||||||
|
// 7. Day of week
|
||||||
|
assertEquals(Instant("2024-01-01T12:00:00Z").toDateTime("Z").dayOfWeek, 1) // Monday
|
||||||
|
assertEquals(Instant("2024-01-07T12:00:00Z").toDateTime("Z").dayOfWeek, 7) // Sunday
|
||||||
|
|
||||||
|
// 8. DateTime to/from Instant
|
||||||
|
val inst = dtP2.toInstant()
|
||||||
|
assertEquals(inst, t1)
|
||||||
|
assertEquals(dtP2.toEpochSeconds(), t1.epochWholeSeconds)
|
||||||
|
|
||||||
|
// 9. toUTC and toTimeZone
|
||||||
|
val dtUTC = dtP2.toUTC()
|
||||||
|
assertEquals(dtUTC.timeZone, "UTC")
|
||||||
|
assertEquals(dtUTC.hour, 12)
|
||||||
|
|
||||||
|
val dtPrague = dtUTC.toTimeZone("+01:00")
|
||||||
|
// Equivalent to Prague winter
|
||||||
|
assertEquals(dtPrague.hour, 13)
|
||||||
|
|
||||||
|
// 10. Component-based constructor
|
||||||
|
val dtComp = DateTime(2024, 5, 20, 15, 30, 45, "+02:00")
|
||||||
|
assertEquals(dtComp.year, 2024)
|
||||||
|
assertEquals(dtComp.month, 5)
|
||||||
|
assertEquals(dtComp.day, 20)
|
||||||
|
assertEquals(dtComp.hour, 15)
|
||||||
|
assertEquals(dtComp.minute, 30)
|
||||||
|
assertEquals(dtComp.second, 45)
|
||||||
|
assertEquals(dtComp.timeZone, "+02:00")
|
||||||
|
|
||||||
|
// 11. parseRFC3339
|
||||||
|
val dtParsed = DateTime.parseRFC3339("2024-05-20T15:30:45+02:00")
|
||||||
|
assertEquals(dtParsed.year, 2024)
|
||||||
|
assertEquals(dtParsed.hour, 15)
|
||||||
|
assertEquals(dtParsed.timeZone, "+02:00")
|
||||||
|
|
||||||
|
val dtParsedZ = DateTime.parseRFC3339("2024-05-20T15:30:45Z")
|
||||||
|
assertEquals(dtParsedZ.timeZone, "Z")
|
||||||
|
assertEquals(dtParsedZ.hour, 15)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testInstantComponents() = runTest {
|
||||||
|
eval("""
|
||||||
|
import lyng.time
|
||||||
|
val t1 = Instant("1970-05-06T07:11:56Z")
|
||||||
|
val dt = t1.toDateTime("Z")
|
||||||
|
assertEquals(dt.year, 1970)
|
||||||
|
assertEquals(dt.month, 5)
|
||||||
|
assertEquals(dt.day, 6)
|
||||||
|
assertEquals(dt.hour, 7)
|
||||||
|
assertEquals(dt.minute, 11)
|
||||||
|
assertEquals(dt.second, 56)
|
||||||
|
assertEquals(dt.dayOfWeek, 3) // 1970-05-06 was Wednesday
|
||||||
|
assertEquals("1970-05-06T07:11:56Z", t1.toRFC3339())
|
||||||
|
assertEquals("1970-05-06T07:11:56Z", t1.toSortableString())
|
||||||
|
|
||||||
|
val dt2 = dt.toTimeZone("+02:00")
|
||||||
|
assertEquals(dt2.hour, 9)
|
||||||
|
assertEquals(dt2.timeZone, "+02:00")
|
||||||
|
|
||||||
|
val dt3 = dt.addMonths(1)
|
||||||
|
assertEquals(dt3.month, 6)
|
||||||
|
assertEquals(dt3.day, 6)
|
||||||
|
|
||||||
|
val dt4 = dt.addYears(1)
|
||||||
|
assertEquals(dt4.year, 1971)
|
||||||
|
|
||||||
|
assertEquals(dt.toInstant(), t1)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testDoubleImports() = runTest {
|
fun testDoubleImports() = runTest {
|
||||||
val s = Scope.new()
|
val s = Scope.new()
|
||||||
@@ -4160,6 +4304,14 @@ class ScriptTest {
|
|||||||
)
|
)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testStringMul() = runTest {
|
||||||
|
eval("""
|
||||||
|
assertEquals("hellohello", "hello"*2)
|
||||||
|
assertEquals("", "hello"*0)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLogicalNot() = runTest {
|
fun testLogicalNot() = runTest {
|
||||||
eval(
|
eval(
|
||||||
@@ -4672,6 +4824,29 @@ class ScriptTest {
|
|||||||
// source name, in our case, is is "tc2":
|
// source name, in our case, is is "tc2":
|
||||||
assertContains(x1.message!!, "tc2")
|
assertContains(x1.message!!, "tc2")
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testFilterStackTrace() = runTest {
|
||||||
|
var x = try {
|
||||||
|
evalNamed( "tc1","""
|
||||||
|
fun f2() = throw IllegalArgumentException("test3")
|
||||||
|
fun f1() = f2()
|
||||||
|
f1()
|
||||||
|
""".trimIndent())
|
||||||
|
fail("this should throw")
|
||||||
|
}
|
||||||
|
catch(x: ExecutionError) {
|
||||||
|
x
|
||||||
|
}
|
||||||
|
assertEquals("""
|
||||||
|
tc1:1:12: test3
|
||||||
|
at tc1:1:12: fun f2() = throw IllegalArgumentException("test3")
|
||||||
|
at tc1:2:12: fun f1() = f2()
|
||||||
|
at tc1:3:1: f1()
|
||||||
|
""".trimIndent(),x.errorObject.getLyngExceptionMessageWithStackTrace())
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
fun testLyngToKotlinExceptionHelpers() = runTest {
|
fun testLyngToKotlinExceptionHelpers() = runTest {
|
||||||
var x = evalNamed( "tc1","""
|
var x = evalNamed( "tc1","""
|
||||||
@@ -4796,5 +4971,77 @@ class ScriptTest {
|
|||||||
assertEquals("r:r", T().l("r"))
|
assertEquals("r:r", T().l("r"))
|
||||||
""".trimIndent())
|
""".trimIndent())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testTypedArgsWithInitializers() = runTest {
|
||||||
|
eval("""
|
||||||
|
fun f(a: String = "foo") = a + "!"
|
||||||
|
fun g(a: String? = null) = a ?: "!!"
|
||||||
|
assertEquals(f(), "foo!")
|
||||||
|
assertEquals(g(), "!!")
|
||||||
|
assertEquals(f("bar"), "bar!")
|
||||||
|
class T(b: Int=42,c: String?=null)
|
||||||
|
assertEquals(42, T().b)
|
||||||
|
assertEquals(null, T().c)
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testArgsPriorityWithSplash() = runTest {
|
||||||
|
eval("""
|
||||||
|
class A {
|
||||||
|
val tags get() = ["foo"]
|
||||||
|
|
||||||
|
fun f1(tags...) = tags
|
||||||
|
|
||||||
|
fun f2(tags...) = f1(...tags)
|
||||||
|
}
|
||||||
|
assertEquals(["bar"], A().f2("bar"))
|
||||||
|
""")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testClamp() = runTest {
|
||||||
|
eval("""
|
||||||
|
// Global clamp
|
||||||
|
assertEquals(5, clamp(5, 0..10))
|
||||||
|
assertEquals(0, clamp(-5, 0..10))
|
||||||
|
assertEquals(10, clamp(15, 0..10))
|
||||||
|
|
||||||
|
// Extension clamp
|
||||||
|
assertEquals(5, 5.clamp(0..10))
|
||||||
|
assertEquals(0, (-5).clamp(0..10))
|
||||||
|
assertEquals(10, 15.clamp(0..10))
|
||||||
|
|
||||||
|
// Exclusive range
|
||||||
|
assertEquals(9, 15.clamp(0..<10))
|
||||||
|
assertEquals(0, (-5).clamp(0..<10))
|
||||||
|
|
||||||
|
// Open-ended range
|
||||||
|
assertEquals(10, 15.clamp(..10))
|
||||||
|
assertEquals(-5, (-5).clamp(..10))
|
||||||
|
assertEquals(5, 5.clamp(0..))
|
||||||
|
assertEquals(0, (-5).clamp(0..))
|
||||||
|
|
||||||
|
// Character range
|
||||||
|
assertEquals('e', 'e'.clamp('a'..'z'))
|
||||||
|
assertEquals('a', ' '.clamp('a'..'z'))
|
||||||
|
assertEquals('z', '}'.clamp('a'..'z'))
|
||||||
|
assertEquals('y', '}'.clamp('a'..<'z'))
|
||||||
|
|
||||||
|
// Real numbers (boundaries are inclusive in current impl for Real)
|
||||||
|
assertEquals(5.5, 5.5.clamp(0.0..10.0))
|
||||||
|
assertEquals(0.0, (-1.5).clamp(0.0..10.0))
|
||||||
|
assertEquals(10.0, 15.5.clamp(0.0..10.0))
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testEmptySpreadList() = runTest {
|
||||||
|
eval("""
|
||||||
|
fun t(a, tags=[]) { [a, ...tags] }
|
||||||
|
assertEquals( [1], t(1) )
|
||||||
|
""".trimIndent())
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -0,0 +1,99 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
import kotlinx.coroutines.test.runTest
|
||||||
|
import net.sergeych.lyng.eval
|
||||||
|
import kotlin.test.Test
|
||||||
|
|
||||||
|
class ValReassignRegressionTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun reassign_ctor_param_field_should_work() = runTest {
|
||||||
|
eval(
|
||||||
|
"""
|
||||||
|
class Wallet(balance = 0) {
|
||||||
|
fun add(amount) {
|
||||||
|
balance += amount
|
||||||
|
}
|
||||||
|
fun transfer(amount) {
|
||||||
|
val balance = 0
|
||||||
|
add(amount)
|
||||||
|
}
|
||||||
|
fun get() { balance }
|
||||||
|
}
|
||||||
|
val w = Wallet()
|
||||||
|
w.transfer(1)
|
||||||
|
assertEquals(1, w.get())
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun reassign_field_should_not_see_caller_locals() = runTest {
|
||||||
|
eval(
|
||||||
|
"""
|
||||||
|
class Wallet(balance = 0) {
|
||||||
|
fun add(amount) { balance += amount }
|
||||||
|
fun get() { balance }
|
||||||
|
}
|
||||||
|
fun doTransfer(w, amount) {
|
||||||
|
val balance = 0
|
||||||
|
w.add(amount)
|
||||||
|
}
|
||||||
|
val w = Wallet()
|
||||||
|
doTransfer(w, 2)
|
||||||
|
assertEquals(2, w.get())
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun reassign_field_should_not_see_caller_param() = runTest {
|
||||||
|
eval(
|
||||||
|
"""
|
||||||
|
class Wallet(balance = 0) {
|
||||||
|
fun add(amount) { balance += amount }
|
||||||
|
fun get() { balance }
|
||||||
|
}
|
||||||
|
fun doTransfer(balance, w, amount) {
|
||||||
|
w.add(amount)
|
||||||
|
}
|
||||||
|
val w = Wallet()
|
||||||
|
doTransfer(0, w, 3)
|
||||||
|
assertEquals(3, w.get())
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun reassign_field_should_not_see_block_local() = runTest {
|
||||||
|
eval(
|
||||||
|
"""
|
||||||
|
class Wallet(balance = 0) {
|
||||||
|
fun add(amount) { balance += amount }
|
||||||
|
fun get() { balance }
|
||||||
|
}
|
||||||
|
val w = Wallet()
|
||||||
|
run {
|
||||||
|
val balance = 0
|
||||||
|
w.add(4)
|
||||||
|
}
|
||||||
|
assertEquals(4, w.get())
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,241 @@
|
|||||||
|
/*
|
||||||
|
* 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 kotlinx.coroutines.test.runTest
|
||||||
|
import net.sergeych.lyng.obj.ObjInstance
|
||||||
|
import net.sergeych.lyng.obj.ObjInt
|
||||||
|
import net.sergeych.lyng.obj.ObjNull
|
||||||
|
import net.sergeych.lyng.obj.toBool
|
||||||
|
import net.sergeych.lynon.lynonDecodeAny
|
||||||
|
import net.sergeych.lynon.lynonEncodeAny
|
||||||
|
import kotlin.test.Test
|
||||||
|
import kotlin.test.assertEquals
|
||||||
|
import kotlin.test.assertFalse
|
||||||
|
import kotlin.test.assertNotNull
|
||||||
|
|
||||||
|
class TransientTest {
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testTransient() = runTest {
|
||||||
|
val script = """
|
||||||
|
class TestTransient(@Transient val a, val b) {
|
||||||
|
@Transient var c = 10
|
||||||
|
var d = 20
|
||||||
|
|
||||||
|
fun check() {
|
||||||
|
a == 1 && b == 2 && c == 10 && d == 20
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
val t = TestTransient(1, 2)
|
||||||
|
t.c = 30
|
||||||
|
t.d = 40
|
||||||
|
t
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val scope = Scope()
|
||||||
|
val t = scope.eval(script) as ObjInstance
|
||||||
|
|
||||||
|
// Check initial state
|
||||||
|
assertEquals(1, (t.readField(scope, "a").value as ObjInt).value)
|
||||||
|
assertEquals(2, (t.readField(scope, "b").value as ObjInt).value)
|
||||||
|
assertEquals(30, (t.readField(scope, "c").value as ObjInt).value)
|
||||||
|
assertEquals(40, (t.readField(scope, "d").value as ObjInt).value)
|
||||||
|
|
||||||
|
// Serialize
|
||||||
|
val serialized = lynonEncodeAny(scope, t)
|
||||||
|
println("[DEBUG_LOG] Serialized size: ${serialized.size}")
|
||||||
|
|
||||||
|
// Deserialized
|
||||||
|
val t2 = lynonDecodeAny(scope, serialized) as ObjInstance
|
||||||
|
|
||||||
|
// b and d should be preserved
|
||||||
|
assertEquals(2, (t2.readField(scope, "b").value as ObjInt).value)
|
||||||
|
assertEquals(40, (t2.readField(scope, "d").value as ObjInt).value)
|
||||||
|
|
||||||
|
// a and c should be transient (lost or default/null)
|
||||||
|
// For constructor args, we currently set ObjNull if transient
|
||||||
|
assertEquals(ObjNull, t2.readField(scope, "a").value)
|
||||||
|
// For class fields, if it's transient it's not serialized, so it gets its initial value during construction
|
||||||
|
assertEquals(10, (t2.readField(scope, "c").value as ObjInt).value)
|
||||||
|
|
||||||
|
// Check JSON
|
||||||
|
val json = t.toJson(scope).toString()
|
||||||
|
println("[DEBUG_LOG] JSON: $json")
|
||||||
|
assertFalse(json.contains("\"a\":"))
|
||||||
|
assertFalse(json.contains("\"c\":"))
|
||||||
|
assertNotNull(json.contains("\"b\":2"))
|
||||||
|
assertNotNull(json.contains("\"d\":40"))
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testTransientDefaultAndEquality() = runTest {
|
||||||
|
val script = """
|
||||||
|
class TestExt(@Transient val a = 100, val b) {
|
||||||
|
@Transient var c = 200
|
||||||
|
var d = 300
|
||||||
|
}
|
||||||
|
|
||||||
|
val t1 = TestExt(b: 2)
|
||||||
|
t1.c = 300
|
||||||
|
t1.d = 400
|
||||||
|
|
||||||
|
val t2 = TestExt(a: 50, b: 2)
|
||||||
|
t2.c = 500
|
||||||
|
t2.d = 400
|
||||||
|
|
||||||
|
// Equality should ignore transient fields a and c
|
||||||
|
val equal = (t1 == t2)
|
||||||
|
|
||||||
|
[t1, t2, equal]
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val scope = Scope()
|
||||||
|
val result = (scope.eval(script) as net.sergeych.lyng.obj.ObjList).list
|
||||||
|
val t1 = result[0] as ObjInstance
|
||||||
|
val t2 = result[1] as ObjInstance
|
||||||
|
val equal = result[2].toBool()
|
||||||
|
|
||||||
|
assertEquals(true, equal, "Objects should be equal despite different transient fields")
|
||||||
|
|
||||||
|
// Serialize t1
|
||||||
|
val serialized = lynonEncodeAny(scope, t1)
|
||||||
|
val t1d = lynonDecodeAny(scope, serialized) as ObjInstance
|
||||||
|
|
||||||
|
// a should have its default value 100, not null or 10
|
||||||
|
assertEquals(100, (t1d.readField(scope, "a").value as ObjInt).value)
|
||||||
|
// c should have its initial value 200
|
||||||
|
assertEquals(200, (t1d.readField(scope, "c").value as ObjInt).value)
|
||||||
|
// b and d should be preserved
|
||||||
|
assertEquals(2, (t1d.readField(scope, "b").value as ObjInt).value)
|
||||||
|
assertEquals(400, (t1d.readField(scope, "d").value as ObjInt).value)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testStaticTransient() = runTest {
|
||||||
|
val script = """
|
||||||
|
class TestStatic {
|
||||||
|
@Transient static var x = 10
|
||||||
|
static var y = 20
|
||||||
|
}
|
||||||
|
TestStatic.x = 30
|
||||||
|
TestStatic.y = 40
|
||||||
|
TestStatic
|
||||||
|
""".trimIndent()
|
||||||
|
val scope = Scope()
|
||||||
|
scope.eval(script)
|
||||||
|
// Static fields aren't serialized yet, but we ensure the parser accepts it
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testTransientSize() = runTest {
|
||||||
|
val script = """
|
||||||
|
class Data1(val a, val b) {
|
||||||
|
var c = 30
|
||||||
|
}
|
||||||
|
class Data2(val a, val b, @Transient val x) {
|
||||||
|
var c = 30
|
||||||
|
@Transient var y = 40
|
||||||
|
}
|
||||||
|
|
||||||
|
val d1 = Data1(10, 20)
|
||||||
|
val d2 = Data2(10, 20, 100)
|
||||||
|
d2.y = 200
|
||||||
|
|
||||||
|
[d1, d2]
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val scope = Scope()
|
||||||
|
val result = (scope.eval(script) as net.sergeych.lyng.obj.ObjList).list
|
||||||
|
val d1 = result[0] as ObjInstance
|
||||||
|
val d2 = result[1] as ObjInstance
|
||||||
|
|
||||||
|
val s1 = lynonEncodeAny(scope, d1)
|
||||||
|
val s2 = lynonEncodeAny(scope, d2)
|
||||||
|
|
||||||
|
println("[DEBUG_LOG] Data1 size: ${s1.size}")
|
||||||
|
println("[DEBUG_LOG] Data2 size: ${s2.size}")
|
||||||
|
|
||||||
|
assertEquals(s1.size, s2.size, "Serialized sizes should match because transient fields are not serialized")
|
||||||
|
|
||||||
|
val j1 = d1.toJson(scope).toString()
|
||||||
|
val j2 = d2.toJson(scope).toString()
|
||||||
|
|
||||||
|
println("[DEBUG_LOG] Data1 JSON: $j1")
|
||||||
|
println("[DEBUG_LOG] Data2 JSON: $j2")
|
||||||
|
|
||||||
|
assertEquals(j1.length, j2.length, "JSON lengths should match")
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testObjectTransient() = runTest {
|
||||||
|
val script = """
|
||||||
|
object MyObject {
|
||||||
|
@Transient var temp = 10
|
||||||
|
var persistent = 20
|
||||||
|
}
|
||||||
|
MyObject.temp = 30
|
||||||
|
MyObject.persistent = 40
|
||||||
|
MyObject
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val scope = Scope()
|
||||||
|
val obj = scope.eval(script) as ObjInstance
|
||||||
|
|
||||||
|
val serialized = lynonEncodeAny(scope, obj)
|
||||||
|
val deserialized = lynonDecodeAny(scope, serialized) as ObjInstance
|
||||||
|
|
||||||
|
// persistent should be 40
|
||||||
|
assertEquals(40, (deserialized.readField(scope, "persistent").value as ObjInt).value)
|
||||||
|
// temp should be restored to 10
|
||||||
|
assertEquals(10, (deserialized.readField(scope, "temp").value as ObjInt).value)
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
fun testStaticTransientToJson() = runTest {
|
||||||
|
val script = """
|
||||||
|
class TestStatic {
|
||||||
|
@Transient static var s1 = 10
|
||||||
|
static var s2 = 20
|
||||||
|
private static var s3 = 30
|
||||||
|
}
|
||||||
|
TestStatic
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val scope = Scope()
|
||||||
|
val cls = scope.eval(script) as net.sergeych.lyng.obj.ObjClass
|
||||||
|
|
||||||
|
val json = cls.toJson(scope).toString()
|
||||||
|
println("[DEBUG_LOG] Class JSON: $json")
|
||||||
|
|
||||||
|
// s2 should be in JSON
|
||||||
|
assertNotNull(json.contains("\"s2\":20"))
|
||||||
|
// s1 should NOT be in JSON (transient)
|
||||||
|
assertFalse(json.contains("\"s1\":"))
|
||||||
|
// s3 should NOT be in JSON (private)
|
||||||
|
assertFalse(json.contains("\"s3\":"))
|
||||||
|
// __class_name should be there
|
||||||
|
assertNotNull(json.contains("\"__class_name\":\"TestStatic\""))
|
||||||
|
|
||||||
|
// Test serialization/deserialization of the class itself
|
||||||
|
val serialized = lynonEncodeAny(scope, cls)
|
||||||
|
val deserialized = lynonDecodeAny(scope, serialized) as net.sergeych.lyng.obj.ObjClass
|
||||||
|
assertEquals(cls, deserialized)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -882,6 +882,22 @@ class LyngFormatterTest {
|
|||||||
}
|
}
|
||||||
""".trimIndent()
|
""".trimIndent()
|
||||||
|
|
||||||
|
val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
|
||||||
|
val out = LyngFormatter.reindent(src, cfg)
|
||||||
|
assertEquals(expected, out)
|
||||||
|
}
|
||||||
|
@Test
|
||||||
|
fun multlinedShortFunIndentation() {
|
||||||
|
val src = """
|
||||||
|
static fun create(walletId, trId, amount) =
|
||||||
|
Cells.createNew(Commission(amount) => ["commission", "w:" + walletId, "tr:" + trId, createdTag(), "pending"])
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
|
val expected = """
|
||||||
|
static fun create(walletId, trId, amount) =
|
||||||
|
Cells.createNew(Commission(amount) => ["commission", "w:" + walletId, "tr:" + trId, createdTag(), "pending"])
|
||||||
|
""".trimIndent()
|
||||||
|
|
||||||
val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
|
val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
|
||||||
val out = LyngFormatter.reindent(src, cfg)
|
val out = LyngFormatter.reindent(src, cfg)
|
||||||
assertEquals(expected, out)
|
assertEquals(expected, out)
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
actual object Benchmarks {
|
||||||
|
actual val enabled: Boolean = false
|
||||||
|
}
|
||||||
@@ -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)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -0,0 +1,33 @@
|
|||||||
|
/*
|
||||||
|
* Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
|
||||||
|
*
|
||||||
|
* Licensed under the Apache License, Version 2.0 (the "License");
|
||||||
|
* you may not use this file except in compliance with the License.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
|
||||||
|
package net.sergeych.lyng
|
||||||
|
|
||||||
|
import kotlinx.cinterop.ExperimentalForeignApi
|
||||||
|
import kotlinx.cinterop.toKString
|
||||||
|
import platform.posix.getenv
|
||||||
|
|
||||||
|
@OptIn(ExperimentalForeignApi::class)
|
||||||
|
actual object Benchmarks {
|
||||||
|
actual val enabled: Boolean = run {
|
||||||
|
fun parse(v: String?): Boolean =
|
||||||
|
v == "true" || v == "1" || v == "yes"
|
||||||
|
val b = getenv("BENCHMARKS")?.toKString()?.lowercase()
|
||||||
|
val l = getenv("LYNG_BENCHMARKS")?.toKString()?.lowercase()
|
||||||
|
parse(b) || parse(l)
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -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
|
||||||
|
|
||||||
|
actual object Benchmarks {
|
||||||
|
actual val enabled: Boolean = false
|
||||||
|
}
|
||||||
@@ -39,7 +39,7 @@ fun Iterable.filter(predicate) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Count all items in this iterable for which predicate return true
|
Count all items in this iterable for which predicate returns true
|
||||||
*/
|
*/
|
||||||
fun Iterable.count(predicate): Int {
|
fun Iterable.count(predicate): Int {
|
||||||
var hits = 0
|
var hits = 0
|
||||||
@@ -266,12 +266,8 @@ class StackTraceEntry(
|
|||||||
/* Print this exception and its stack trace to standard output. */
|
/* Print this exception and its stack trace to standard output. */
|
||||||
fun Exception.printStackTrace() {
|
fun Exception.printStackTrace() {
|
||||||
println(this)
|
println(this)
|
||||||
var lastEntry = null
|
for( entry in stackTrace )
|
||||||
for( entry in stackTrace ) {
|
|
||||||
if( lastEntry == null || lastEntry !is StackTraceEntry || lastEntry.line != entry.line )
|
|
||||||
println("\tat "+entry.toString())
|
println("\tat "+entry.toString())
|
||||||
lastEntry = entry
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Compile this string into a regular expression. */
|
/* Compile this string into a regular expression. */
|
||||||
|
|||||||
@@ -0,0 +1,156 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3044:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3076:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3317:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3713:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3724:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3783:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3894:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3950:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:358:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:377:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 261.854157 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 143.359303 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 198.727671 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 165.057842 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1212.62923 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1221.344844 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 911.390453 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 864.74467 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1258.596122 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1215.214754 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 813.8911 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 840.201914 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 721.329794 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 664.626564 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=246.670 ms, ON=247.664 ms, speedup=1.00x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 358.568027 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 357.649314 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 210.029012 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 197.480796 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 189.724828 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 171.944462 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 155.800531 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 159.326021 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 493.764263 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 473.911057 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 414.496391 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 379.154141 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 395.901223 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 361.008923 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 614.851677 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 606.423947 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 322.701469 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 332.466691 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 125.613919 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 127.188579 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 271.994907 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 269.043016 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1224.41111 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 1159.586817 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 494.4744 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 420.160566 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 632.699991 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 558.980979 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 32s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Arguments.kt:171:13 Check for instance is always 'true'.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3044:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3076:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3317:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3713:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3724:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3783:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3894:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3950:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 262.456983 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 143.016118 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 204.504575 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 169.943911 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1249.839264 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1222.298584 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 901.399509 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 862.404202 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1288.885586 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1240.515769 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 818.753611 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 846.609202 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 673.750784 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 656.929851 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=277.571 ms, ON=278.333 ms, speedup=1.00x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 352.770834 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 350.420946 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 203.043167 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 191.784157 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 190.975557 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 173.62457 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 162.948512 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 161.115548 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 481.70436 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 457.081838 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 416.136033 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 377.996669 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 415.789128 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 369.789878 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 615.689206 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 604.213533 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 330.268329 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 331.937563 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 130.221941 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 129.656747 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 280.648819 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 276.585595 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1244.04352 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 1181.395693 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 455.504952 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 388.443547 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 628.199793 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 574.342775 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 32s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3044:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3076:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3317:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3713:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3724:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3783:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3894:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3950:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 261.781459 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 145.930937 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 198.865061 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 166.602828 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1247.05106 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1281.54336 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 883.211818 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 865.689378 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1233.018601 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1481.964038 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 888.881526 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 849.302933 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 665.365 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 663.883057 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=247.421 ms, ON=260.564 ms, speedup=0.95x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 353.794891 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 353.008114 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 202.620604 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 188.753098 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 187.350501 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 172.926716 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 159.856375 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 173.291963 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 484.924666 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 470.462696 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 418.550739 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 377.176886 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 398.385204 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 361.726326 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 606.153624 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 602.269093 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 327.139818 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 326.264549 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 127.960191 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 133.286108 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 289.541793 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 272.736055 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1238.097545 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 1189.624292 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 447.781066 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 373.556778 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 574.938314 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 537.896984 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 32s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3044:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3076:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3320:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3716:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3727:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3786:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3897:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3953:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 253.651654 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 146.390764 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 197.226054 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 168.955589 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1256.240598 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1270.063908 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 896.05655 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 908.729676 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1275.701226 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1262.923161 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 904.80078 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 843.661706 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 693.294337 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 655.907501 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=246.831 ms, ON=249.673 ms, speedup=0.99x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 363.565902 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 357.239034 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 205.439227 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 192.811329 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 190.153039 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 171.03625 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 171.823152 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 172.076498 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 470.255577 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 452.226068 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 425.250966 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 372.065608 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 425.557633 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 398.662616 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 670.172011 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 654.491316 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 368.642342 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 371.610689 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 132.834786 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 128.264586 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 271.281035 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 265.903301 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1239.838114 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 1170.640179 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 440.47053 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 372.095174 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 611.454512 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 553.868896 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 32s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3096:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3128:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3161:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3372:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3768:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3779:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3838:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3949:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:4005:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 268.708055 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 146.48493 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 200.079276 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 163.315912 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1553.293592 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1473.171537 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 1069.276106 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 938.902009 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1272.837347 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1232.000995 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 821.533602 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 845.562175 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 713.778041 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 658.92245 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=258.841 ms, ON=260.836 ms, speedup=0.99x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 359.929596 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 355.440048 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 201.239366 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 193.027976 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 193.231822 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 169.126707 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 152.807956 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 155.12379 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 487.13174 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 458.34973 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 420.451323 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 380.196618 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 407.040834 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 376.63534 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 651.947325 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 665.276754 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 343.185945 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 333.229274 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 128.027033 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 128.223778 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 272.765371 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 267.282587 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1222.526972 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 1156.325094 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 454.25713 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 435.042988 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 646.493027 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 581.51493 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 33s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3044:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3076:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3317:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3713:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3724:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3783:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3894:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3950:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt:169:37 Redundant call of conversion method.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 261.750618 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 146.453823 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 195.212879 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 162.023578 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1500.893007 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1470.571042 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 1069.296265 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 979.876815 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1282.033869 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1219.102212 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 817.077586 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 836.022994 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 694.858051 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 657.045255 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=257.782 ms, ON=248.041 ms, speedup=1.04x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 352.616677 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 342.878941 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 199.536636 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 184.094618 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 192.697462 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 169.343891 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 172.952628 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 175.110539 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 474.235439 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 447.779765 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 416.685434 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 385.882443 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 404.699708 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 363.070008 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 624.839841 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 615.958067 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 329.06723 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 345.786502 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 127.328515 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 128.997015 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 275.285879 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 272.488545 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1007.052847 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 942.271572 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 501.928282 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 431.511816 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 713.844255 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 670.054138 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 32s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3077:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3142:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3350:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3746:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3757:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3816:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3927:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3983:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt:169:37 Redundant call of conversion method.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 255.650854 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 145.478367 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 194.190057 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 161.917102 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1553.057072 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1240.793002 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 944.216355 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 1009.585989 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1539.226472 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1454.032021 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 977.674848 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 990.058604 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 853.990613 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 786.133583 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=268.317 ms, ON=280.306 ms, speedup=0.96x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 373.337982 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 363.041028 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 203.456039 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 189.400538 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 191.685426 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 172.746472 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 172.601148 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 175.298872 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 480.488372 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 449.23481 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 428.089067 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 392.908699 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 409.659747 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 367.216414 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 608.613603 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 626.039278 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 325.012701 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 321.701777 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 127.06677 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 129.773497 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 279.046361 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 271.50303 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1022.352328 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 964.474767 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 496.707269 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 442.890336 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 695.24589 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 579.05104 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 34s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,157 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3077:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3142:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3350:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3746:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3757:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3816:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3927:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3983:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt:169:37 Redundant call of conversion method.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 255.197357 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 145.587919 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 192.491336 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 162.773639 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1527.164983 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1468.249877 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 1067.915333 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 1006.785753 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1525.341699 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1272.182191 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 820.632254 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 840.236564 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 688.095527 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 655.496511 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=257.927 ms, ON=256.999 ms, speedup=1.00x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 354.975875 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 345.167837 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 202.94016 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 189.847027 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 194.183153 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 166.705436 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 158.344393 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 171.7144 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 485.762962 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 451.642059 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 422.33805 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 381.000391 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 421.92221 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 374.912331 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 619.019405 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 607.095909 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 344.680073 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 370.68396 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 123.837196 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 127.987498 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 275.825602 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 272.281156 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1004.34663 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 950.919274 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 467.891003 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 380.721475 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 608.237558 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 611.825714 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 33s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,156 @@
|
|||||||
|
Reusing configuration cache.
|
||||||
|
> Task :lynglib:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lyngio:jvmProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestProcessResources NO-SOURCE
|
||||||
|
> Task :lynglib:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lyngio:kmpPartiallyResolvedDependenciesChecker
|
||||||
|
> Task :lynglib:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lyngio:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmMainResources SKIPPED
|
||||||
|
> Task :lynglib:processJvmTestResources SKIPPED
|
||||||
|
> Task :lyngio:checkKotlinGradlePluginConfigurationErrors SKIPPED
|
||||||
|
> Task :lynglib:generateLyngStdlib
|
||||||
|
> Task :lynglib:generateBuildKonfig
|
||||||
|
|
||||||
|
> Task :lynglib:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:228:25 'when' is exhaustive so 'else' is redundant here.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3044:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3076:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3109:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3317:46 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3713:42 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3724:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3783:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3894:62 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Compiler.kt:3950:66 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt:727:31 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:507:50 The corresponding parameter in the supertype 'Statement' is named 'scope'. This may cause problems when calling this function with named arguments.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt:820:57 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:33:32 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:158:39 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:177:64 'val monthNumber: Int' is deprecated. Use the 'month' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:179:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:181:64 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjDateTime.kt:266:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:35:31 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:102:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:106:24 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:117:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:119:38 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:123:29 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:125:41 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:139:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:144:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:149:25 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:202:69 'val dayOfMonth: Int' is deprecated. Use the 'day' property instead.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:212:28 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:222:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstant.kt:234:21 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:432:35 No cast needed.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt:451:35 No cast needed.
|
||||||
|
|
||||||
|
> Task :lynglib:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmMainClasses
|
||||||
|
> Task :lynglib:jvmJar
|
||||||
|
|
||||||
|
> Task :lyngio:compileKotlinJvm
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:192:71 'typealias Instant = Instant' is deprecated. This type is deprecated in favor of `kotlin.time.Instant`.
|
||||||
|
w: file:///home/sergeych/dev/ling_lib/lyngio/src/commonMain/kotlin/net/sergeych/lyng/io/fs/LyngFsModule.kt:315:51 Redundant call of conversion method.
|
||||||
|
|
||||||
|
> Task :lyngio:compileJvmMainJava NO-SOURCE
|
||||||
|
> Task :lyngio:jvmMainClasses
|
||||||
|
> Task :lyngio:jvmJar
|
||||||
|
> Task :lynglib:compileTestKotlinJvm
|
||||||
|
> Task :lynglib:compileJvmTestJava NO-SOURCE
|
||||||
|
> Task :lynglib:jvmTestClasses
|
||||||
|
|
||||||
|
> Task :lynglib:jvmTest
|
||||||
|
|
||||||
|
ArithmeticBenchmarkTest[jvm] > benchmarkIntArithmeticAndComparisons[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=OFF]: 257.626421 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-sum x400000 [PRIMITIVE_FASTOPS=ON]: 145.74696 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=OFF]: 185.585751 ms
|
||||||
|
[DEBUG_LOG] [BENCH] int-cmp x400000 [PRIMITIVE_FASTOPS=ON]: 163.520035 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1505.046393 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1314.629855 ms
|
||||||
|
|
||||||
|
CallBenchmarkTest[jvm] > benchmarkSimpleFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=OFF]: 894.419862 ms
|
||||||
|
[DEBUG_LOG] [BENCH] calls x300000 [ARG_BUILDER=ON]: 872.837744 ms
|
||||||
|
|
||||||
|
CallMixedArityBenchmarkTest[jvm] > benchmarkMixedArityCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=OFF]: 1240.254948 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed-arity x200000 [ARG_BUILDER=ON]: 1212.818849 ms
|
||||||
|
|
||||||
|
CallPoolingBenchmarkTest[jvm] > benchmarkScopePoolingOnFunctionCalls[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=OFF]: 809.588732 ms
|
||||||
|
[DEBUG_LOG] [BENCH] call-pooling x300000 [SCOPE_POOL=ON]: 925.016684 ms
|
||||||
|
|
||||||
|
CallSplatBenchmarkTest[jvm] > benchmarkCallsWithSplatArgs[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=OFF]: 721.186901 ms
|
||||||
|
[DEBUG_LOG] [BENCH] splat-calls x120000 [ARG_BUILDER=ON]: 637.576161 ms
|
||||||
|
|
||||||
|
ConcurrencyCallBenchmarkTest[jvm] > benchmark_multithread_calls_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] ConcurrencyCallBenchmark workers=8 iters=15000 each: OFF=262.726 ms, ON=255.278 ms, speedup=1.03x
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkExpressionChains[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=OFF]: 362.438514 ms
|
||||||
|
[DEBUG_LOG] [BENCH] expr-chain x350000 [RVAL_FASTPATH=ON]: 340.324569 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkListIndexReads[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=OFF]: 195.843032 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-index x350000 [RVAL_FASTPATH=ON]: 186.899727 ms
|
||||||
|
|
||||||
|
ExpressionBenchmarkTest[jvm] > benchmarkFieldReadPureReceiver[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=OFF]: 184.415897 ms
|
||||||
|
[DEBUG_LOG] [BENCH] field-read x300000 [RVAL_FASTPATH=ON]: 167.959195 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkSumInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=OFF]: 162.448057 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-sum x200000 [PRIMITIVE_FASTOPS=ON]: 159.74125 ms
|
||||||
|
|
||||||
|
ListOpsBenchmarkTest[jvm] > benchmarkContainsInts[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=OFF]: 481.042413 ms
|
||||||
|
[DEBUG_LOG] [BENCH] list-contains x1000000 [PRIMITIVE_FASTOPS=ON]: 455.885378 ms
|
||||||
|
|
||||||
|
LocalVarBenchmarkTest[jvm] > benchmarkLocalReadsWrites_off_on[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=OFF, FAST_LOCAL=OFF]: 409.51578 ms
|
||||||
|
[DEBUG_LOG] [BENCH] locals x400000 [PIC=ON, FAST_LOCAL=ON]: 372.056401 ms
|
||||||
|
|
||||||
|
MethodPoolingBenchmarkTest[jvm] > benchmarkInstanceMethodCallsWithPooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=OFF]: 388.436636 ms
|
||||||
|
[DEBUG_LOG] [BENCH] method-loop x300000 [SCOPE_POOL=ON]: 361.562638 ms
|
||||||
|
|
||||||
|
MixedBenchmarkTest[jvm] > benchmarkMixedWorkloadRvalFastpath[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=OFF]: 631.060283 ms
|
||||||
|
[DEBUG_LOG] [BENCH] mixed x250000 [RVAL_FASTPATH=ON]: 596.452285 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkMethodPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=OFF, POOL=OFF: 325.619575 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Method PIC=ON, POOL=ON: 323.664554 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkFieldGetSetPic[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=OFF: 130.20855 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Field PIC=ON: 125.922059 ms
|
||||||
|
|
||||||
|
PicBenchmarkTest[jvm] > benchmarkLoopScopePooling[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=OFF: 265.902703 ms
|
||||||
|
[DEBUG_LOG] [BENCH] Loop Pool=ON: 264.289188 ms
|
||||||
|
|
||||||
|
RangeBenchmarkTest[jvm] > benchmarkIntRangeForIn[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=OFF]: 1218.053408 ms
|
||||||
|
[DEBUG_LOG] [BENCH] range-for-in x5000 (inner 0..999) [PRIMITIVE_FASTOPS=ON]: 1156.935646 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkDynamicPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=OFF]: 433.071618 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-dynamic x300000 [REGEX_CACHE=ON]: 371.30824 ms
|
||||||
|
|
||||||
|
RegexBenchmarkTest[jvm] > benchmarkLiteralPatternMatches[jvm] STANDARD_OUT
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=OFF]: 570.399724 ms
|
||||||
|
[DEBUG_LOG] [BENCH] regex-literal x500000 [REGEX_CACHE=ON]: 533.532049 ms
|
||||||
|
|
||||||
|
BUILD SUCCESSFUL in 33s
|
||||||
|
10 actionable tasks: 10 executed
|
||||||
|
Configuration cache entry reused.
|
||||||
@@ -0,0 +1,246 @@
|
|||||||
|
diff --git a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt
|
||||||
|
index 0671102..d4cb6ba 100644
|
||||||
|
--- a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt
|
||||||
|
+++ b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInt.kt
|
||||||
|
@@ -55,7 +55,11 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
||||||
|
|
||||||
|
override suspend fun compareTo(scope: Scope, other: Obj): Int {
|
||||||
|
if (other !is Numeric) return -2
|
||||||
|
- return value.compareTo(other.doubleValue)
|
||||||
|
+ return if (other is ObjInt) {
|
||||||
|
+ value.compareTo(other.value)
|
||||||
|
+ } else {
|
||||||
|
+ doubleValue.compareTo(other.doubleValue)
|
||||||
|
+ }
|
||||||
|
}
|
||||||
|
|
||||||
|
override fun toString(): String = value.toString()
|
||||||
|
@@ -192,4 +196,4 @@ class ObjInt(val value: Long, override val isConst: Boolean = false) : Obj(), Nu
|
||||||
|
}
|
||||||
|
|
||||||
|
fun Int.toObj() = ObjInt.of(this.toLong())
|
||||||
|
-fun Long.toObj() = ObjInt.of(this)
|
||||||
|
\ No newline at end of file
|
||||||
|
+fun Long.toObj() = ObjInt.of(this)
|
||||||
|
diff --git a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRange.kt b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRange.kt
|
||||||
|
index 0c631d0..dc61c66 100644
|
||||||
|
--- a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRange.kt
|
||||||
|
+++ b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRange.kt
|
||||||
|
@@ -96,6 +96,30 @@ class ObjRange(val start: Obj?, val end: Obj?, val isEndInclusive: Boolean) : Ob
|
||||||
|
if (other is ObjRange)
|
||||||
|
return containsRange(scope, other)
|
||||||
|
|
||||||
|
+ if (net.sergeych.lyng.PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
+ if (start is ObjInt && end is ObjInt && other is ObjInt) {
|
||||||
|
+ val s = start.value
|
||||||
|
+ val e = end.value
|
||||||
|
+ val v = other.value
|
||||||
|
+ if (v < s) return false
|
||||||
|
+ return if (isEndInclusive) v <= e else v < e
|
||||||
|
+ }
|
||||||
|
+ if (start is ObjChar && end is ObjChar && other is ObjChar) {
|
||||||
|
+ val s = start.value
|
||||||
|
+ val e = end.value
|
||||||
|
+ val v = other.value
|
||||||
|
+ if (v < s) return false
|
||||||
|
+ return if (isEndInclusive) v <= e else v < e
|
||||||
|
+ }
|
||||||
|
+ if (start is ObjString && end is ObjString && other is ObjString) {
|
||||||
|
+ val s = start.value
|
||||||
|
+ val e = end.value
|
||||||
|
+ val v = other.value
|
||||||
|
+ if (v < s) return false
|
||||||
|
+ return if (isEndInclusive) v <= e else v < e
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
if (start == null && end == null) return true
|
||||||
|
if (start != null) {
|
||||||
|
if (start.compareTo(scope, other) > 0) return false
|
||||||
|
@@ -241,4 +265,3 @@ class ObjRange(val start: Obj?, val end: Obj?, val isEndInclusive: Boolean) : Ob
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
-
|
||||||
|
diff --git a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt
|
||||||
|
index 2dd0ae6..76e56d4 100644
|
||||||
|
--- a/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt
|
||||||
|
+++ b/lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt
|
||||||
|
@@ -152,6 +152,90 @@ class BinaryOpRef(private val op: BinOp, private val left: ObjRef, private val r
|
||||||
|
|
||||||
|
// Primitive fast paths for common cases (guarded by PerfFlags.PRIMITIVE_FASTOPS)
|
||||||
|
if (PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
+ // Fast range equality: avoid compareTo/equals for ObjRange when possible
|
||||||
|
+ if ((op == BinOp.EQ || op == BinOp.NEQ) && a is ObjRange && b is ObjRange) {
|
||||||
|
+ val eq = (a.start == b.start && a.end == b.end)
|
||||||
|
+ if (PerfFlags.PIC_DEBUG_COUNTERS) PerfStats.primitiveFastOpsHit++
|
||||||
|
+ return if (op == BinOp.EQ) {
|
||||||
|
+ if (eq) ObjTrue else ObjFalse
|
||||||
|
+ } else {
|
||||||
|
+ if (eq) ObjFalse else ObjTrue
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ // Fast membership for common containers
|
||||||
|
+ if (op == BinOp.IN || op == BinOp.NOTIN) {
|
||||||
|
+ val inResult: Boolean? = when (b) {
|
||||||
|
+ is ObjList -> {
|
||||||
|
+ if (a is ObjInt) {
|
||||||
|
+ var i = 0
|
||||||
|
+ val sz = b.list.size
|
||||||
|
+ var found = false
|
||||||
|
+ while (i < sz) {
|
||||||
|
+ val v = b.list[i]
|
||||||
|
+ if (v is ObjInt && v.value == a.value) {
|
||||||
|
+ found = true
|
||||||
|
+ break
|
||||||
|
+ }
|
||||||
|
+ i++
|
||||||
|
+ }
|
||||||
|
+ found
|
||||||
|
+ } else {
|
||||||
|
+ b.list.contains(a)
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ is ObjSet -> b.set.contains(a)
|
||||||
|
+ is ObjMap -> b.map.containsKey(a)
|
||||||
|
+ is ObjRange -> {
|
||||||
|
+ when (a) {
|
||||||
|
+ is ObjInt -> {
|
||||||
|
+ val s = b.start as? ObjInt
|
||||||
|
+ val e = b.end as? ObjInt
|
||||||
|
+ val v = a.value
|
||||||
|
+ if (s == null && e == null) null
|
||||||
|
+ else {
|
||||||
|
+ if (s != null && v < s.value) false
|
||||||
|
+ else if (e != null) if (b.isEndInclusive) v <= e.value else v < e.value else true
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ is ObjChar -> {
|
||||||
|
+ val s = b.start as? ObjChar
|
||||||
|
+ val e = b.end as? ObjChar
|
||||||
|
+ val v = a.value
|
||||||
|
+ if (s == null && e == null) null
|
||||||
|
+ else {
|
||||||
|
+ if (s != null && v < s.value) false
|
||||||
|
+ else if (e != null) if (b.isEndInclusive) v <= e.value else v < e.value else true
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ is ObjString -> {
|
||||||
|
+ val s = b.start as? ObjString
|
||||||
|
+ val e = b.end as? ObjString
|
||||||
|
+ val v = a.value
|
||||||
|
+ if (s == null && e == null) null
|
||||||
|
+ else {
|
||||||
|
+ if (s != null && v < s.value) false
|
||||||
|
+ else if (e != null) if (b.isEndInclusive) v <= e.value else v < e.value else true
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ else -> null
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ is ObjString -> when (a) {
|
||||||
|
+ is ObjString -> b.value.contains(a.value)
|
||||||
|
+ is ObjChar -> b.value.contains(a.value)
|
||||||
|
+ else -> null
|
||||||
|
+ }
|
||||||
|
+ else -> null
|
||||||
|
+ }
|
||||||
|
+ if (inResult != null) {
|
||||||
|
+ if (PerfFlags.PIC_DEBUG_COUNTERS) PerfStats.primitiveFastOpsHit++
|
||||||
|
+ return if (op == BinOp.IN) {
|
||||||
|
+ if (inResult) ObjTrue else ObjFalse
|
||||||
|
+ } else {
|
||||||
|
+ if (inResult) ObjFalse else ObjTrue
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
// Fast boolean ops when both operands are ObjBool
|
||||||
|
if (a is ObjBool && b is ObjBool) {
|
||||||
|
val r: Obj? = when (op) {
|
||||||
|
@@ -604,7 +688,37 @@ class AssignOpRef(
|
||||||
|
else -> null
|
||||||
|
}
|
||||||
|
if (inPlace != null) return inPlace.asReadonly
|
||||||
|
- val result: Obj = when (op) {
|
||||||
|
+ val fast: Obj? = if (PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
+ when {
|
||||||
|
+ x is ObjInt && y is ObjInt -> {
|
||||||
|
+ val xv = x.value
|
||||||
|
+ val yv = y.value
|
||||||
|
+ when (op) {
|
||||||
|
+ BinOp.PLUS -> ObjInt.of(xv + yv)
|
||||||
|
+ BinOp.MINUS -> ObjInt.of(xv - yv)
|
||||||
|
+ BinOp.STAR -> ObjInt.of(xv * yv)
|
||||||
|
+ BinOp.SLASH -> if (yv != 0L) ObjInt.of(xv / yv) else null
|
||||||
|
+ BinOp.PERCENT -> if (yv != 0L) ObjInt.of(xv % yv) else null
|
||||||
|
+ else -> null
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ (x is ObjInt || x is ObjReal) && (y is ObjInt || y is ObjReal) -> {
|
||||||
|
+ val xv = if (x is ObjInt) x.doubleValue else (x as ObjReal).value
|
||||||
|
+ val yv = if (y is ObjInt) y.doubleValue else (y as ObjReal).value
|
||||||
|
+ when (op) {
|
||||||
|
+ BinOp.PLUS -> ObjReal.of(xv + yv)
|
||||||
|
+ BinOp.MINUS -> ObjReal.of(xv - yv)
|
||||||
|
+ BinOp.STAR -> ObjReal.of(xv * yv)
|
||||||
|
+ BinOp.SLASH -> ObjReal.of(xv / yv)
|
||||||
|
+ BinOp.PERCENT -> ObjReal.of(xv % yv)
|
||||||
|
+ else -> null
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+ x is ObjString && op == BinOp.PLUS -> ObjString(x.value + y.toString())
|
||||||
|
+ else -> null
|
||||||
|
+ }
|
||||||
|
+ } else null
|
||||||
|
+ val result: Obj = fast ?: when (op) {
|
||||||
|
BinOp.PLUS -> x.plus(scope, y)
|
||||||
|
BinOp.MINUS -> x.minus(scope, y)
|
||||||
|
BinOp.STAR -> x.mul(scope, y)
|
||||||
|
@@ -632,7 +746,15 @@ class IncDecRef(
|
||||||
|
// We now treat numbers as immutable and always perform write-back via setAt.
|
||||||
|
// This avoids issues where literals are shared and mutated in-place.
|
||||||
|
// For post-inc: return ORIGINAL value; for pre-inc: return NEW value.
|
||||||
|
- val result = if (isIncrement) v.plus(scope, one) else v.minus(scope, one)
|
||||||
|
+ val result = if (PerfFlags.PRIMITIVE_FASTOPS) {
|
||||||
|
+ when (v) {
|
||||||
|
+ is ObjInt -> if (isIncrement) ObjInt.of(v.value + 1L) else ObjInt.of(v.value - 1L)
|
||||||
|
+ is ObjReal -> if (isIncrement) ObjReal.of(v.value + 1.0) else ObjReal.of(v.value - 1.0)
|
||||||
|
+ else -> if (isIncrement) v.plus(scope, one) else v.minus(scope, one)
|
||||||
|
+ }
|
||||||
|
+ } else {
|
||||||
|
+ if (isIncrement) v.plus(scope, one) else v.minus(scope, one)
|
||||||
|
+ }
|
||||||
|
target.setAt(atPos, scope, result)
|
||||||
|
return (if (isPost) v else result).asReadonly
|
||||||
|
}
|
||||||
|
@@ -1246,8 +1368,8 @@ class IndexRef(
|
||||||
|
val i = idx.toInt()
|
||||||
|
return ObjChar(base.value[i]).asMutable
|
||||||
|
}
|
||||||
|
- // Map[String] fast path (common case); return ObjNull if absent
|
||||||
|
- if (base is ObjMap && idx is ObjString) {
|
||||||
|
+ // Map[String/Int/Char] fast path (common cases); return ObjNull if absent
|
||||||
|
+ if (base is ObjMap && (idx is ObjString || idx is ObjInt || idx is ObjChar)) {
|
||||||
|
val v = base.map[idx] ?: ObjNull
|
||||||
|
return v.asMutable
|
||||||
|
}
|
||||||
|
@@ -1321,8 +1443,8 @@ class IndexRef(
|
||||||
|
val i = idx.toInt()
|
||||||
|
return ObjChar(base.value[i])
|
||||||
|
}
|
||||||
|
- // Map[String] fast path
|
||||||
|
- if (base is ObjMap && idx is ObjString) {
|
||||||
|
+ // Map[String/Int/Char] fast path
|
||||||
|
+ if (base is ObjMap && (idx is ObjString || idx is ObjInt || idx is ObjChar)) {
|
||||||
|
return base.map[idx] ?: ObjNull
|
||||||
|
}
|
||||||
|
if (PerfFlags.INDEX_PIC) {
|
||||||
|
@@ -1393,7 +1515,7 @@ class IndexRef(
|
||||||
|
return
|
||||||
|
}
|
||||||
|
// Direct write fast path for ObjMap + ObjString
|
||||||
|
- if (base is ObjMap && idx is ObjString) {
|
||||||
|
+ if (base is ObjMap && (idx is ObjString || idx is ObjInt || idx is ObjChar)) {
|
||||||
|
base.map[idx] = newValue
|
||||||
|
return
|
||||||
|
}
|
||||||
@@ -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.
|
||||||
@@ -118,7 +118,7 @@ fun App() {
|
|||||||
Div({ classes("col-12", if (isDocsRoute) "col-lg-9" else "col-lg-12") }) {
|
Div({ classes("col-12", if (isDocsRoute) "col-lg-9" else "col-lg-12") }) {
|
||||||
when {
|
when {
|
||||||
route.isBlank() -> HomePage()
|
route.isBlank() -> HomePage()
|
||||||
route == "tryling" -> TryLyngPage()
|
route.startsWith("tryling") -> TryLyngPage(route)
|
||||||
route.startsWith("search") -> SearchPage(route)
|
route.startsWith("search") -> SearchPage(route)
|
||||||
!isDocsRoute -> ReferencePage()
|
!isDocsRoute -> ReferencePage()
|
||||||
else -> DocsPage(
|
else -> DocsPage(
|
||||||
|
|||||||
@@ -15,7 +15,9 @@
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
import androidx.compose.runtime.*
|
||||||
|
import kotlinx.browser.window
|
||||||
|
import kotlinx.coroutines.delay
|
||||||
import net.sergeych.lyngweb.ensureBootstrapCodeBlocks
|
import net.sergeych.lyngweb.ensureBootstrapCodeBlocks
|
||||||
import net.sergeych.lyngweb.highlightLyngHtml
|
import net.sergeych.lyngweb.highlightLyngHtml
|
||||||
import net.sergeych.lyngweb.htmlEscape
|
import net.sergeych.lyngweb.htmlEscape
|
||||||
@@ -23,6 +25,141 @@ import org.jetbrains.compose.web.dom.*
|
|||||||
|
|
||||||
@Composable
|
@Composable
|
||||||
fun HomePage() {
|
fun HomePage() {
|
||||||
|
val samples = remember {
|
||||||
|
listOf(
|
||||||
|
"""
|
||||||
|
// Everything is an expression
|
||||||
|
val x = 10
|
||||||
|
val status = if (x > 0) "Positive" else "Zero or Negative"
|
||||||
|
|
||||||
|
// Even loops return values!
|
||||||
|
val result = for (i in 1..5) {
|
||||||
|
if (i == 3) break "Found 3!"
|
||||||
|
} else "Not found"
|
||||||
|
|
||||||
|
println("Result: " + result)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Functional power with ranges and collections
|
||||||
|
val squares = (1..10)
|
||||||
|
.filter { it % 2 == 0 }
|
||||||
|
.map { it * it }
|
||||||
|
|
||||||
|
println("Even squares: " + squares)
|
||||||
|
// Output: [4, 16, 36, 64, 100]
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Flexible map literals and shorthands
|
||||||
|
val id = 101
|
||||||
|
val name = "Lyng"
|
||||||
|
val base = { id:, name: } // Shorthand for id: id, name: name
|
||||||
|
|
||||||
|
val full = { ...base, version: "1.0", status: "active" }
|
||||||
|
println(full)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Modern null safety
|
||||||
|
var config = null
|
||||||
|
config ?= { timeout: 30 } // Assign only if null
|
||||||
|
|
||||||
|
val timeout = config?.timeout ?: 60
|
||||||
|
println("Timeout is: " + timeout)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Destructuring with splat operator
|
||||||
|
val [first, middle..., last] = [1, 2, 3, 4, 5, 6]
|
||||||
|
|
||||||
|
println("First: " + first)
|
||||||
|
println("Middle: " + middle)
|
||||||
|
println("Last: " + last)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Diamond-safe Multiple Inheritance (C3 MRO)
|
||||||
|
interface Logger {
|
||||||
|
fun log(m) = println("[LOG] " + m)
|
||||||
|
}
|
||||||
|
interface Auth {
|
||||||
|
fun login(u) = println("Login: " + u)
|
||||||
|
}
|
||||||
|
|
||||||
|
class App() : Logger, Auth {
|
||||||
|
fun run() {
|
||||||
|
log("Starting...")
|
||||||
|
login("admin")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
App().run()
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Extension functions and properties
|
||||||
|
fun String.shout() = this.toUpperCase() + "!!!"
|
||||||
|
|
||||||
|
println("hello".shout())
|
||||||
|
|
||||||
|
val List.second get = this[1]
|
||||||
|
println([10, 20, 30].second)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Non-local returns from closures
|
||||||
|
fun findFirst(list, predicate) {
|
||||||
|
list.forEach {
|
||||||
|
if (predicate(it)) return@findFirst it
|
||||||
|
}
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
|
val found = findFirst([1, 5, 8, 12]) { it > 10 }
|
||||||
|
println("Found: " + found)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Easy operator overloading
|
||||||
|
class Vector(val x, val y) {
|
||||||
|
override fun plus(other) = Vector(x + other.x, y + other.y)
|
||||||
|
override fun toString() = "Vector(%g, %g)"(x, y)
|
||||||
|
}
|
||||||
|
|
||||||
|
val v1 = Vector(1, 2)
|
||||||
|
val v2 = Vector(3, 4)
|
||||||
|
println(v1 + v2)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Property delegation to Map
|
||||||
|
class User() {
|
||||||
|
var name by Map()
|
||||||
|
}
|
||||||
|
|
||||||
|
val u = User()
|
||||||
|
u.name = "Sergey"
|
||||||
|
println("User name: " + u.name)
|
||||||
|
""".trimIndent(),
|
||||||
|
"""
|
||||||
|
// Implicit coroutines: parallelism without ceremony
|
||||||
|
import lyng.time
|
||||||
|
|
||||||
|
val d1 = launch {
|
||||||
|
delay(100.milliseconds)
|
||||||
|
"Task A finished"
|
||||||
|
}
|
||||||
|
val d2 = launch {
|
||||||
|
delay(50.milliseconds)
|
||||||
|
"Task B finished"
|
||||||
|
}
|
||||||
|
|
||||||
|
println(d1.await())
|
||||||
|
println(d2.await())
|
||||||
|
""".trimIndent()
|
||||||
|
)
|
||||||
|
}
|
||||||
|
|
||||||
|
var currentSlide by remember { mutableStateOf((samples.indices).random()) }
|
||||||
|
|
||||||
|
LaunchedEffect(Unit) {
|
||||||
|
ensureSlideshowStyles()
|
||||||
|
while (true) {
|
||||||
|
delay(7000)
|
||||||
|
currentSlide = (currentSlide + 1) % samples.size
|
||||||
|
}
|
||||||
|
}
|
||||||
// Hero section
|
// Hero section
|
||||||
Section({ classes("py-4", "py-lg-5") }) {
|
Section({ classes("py-4", "py-lg-5") }) {
|
||||||
Div({ classes("text-center") }) {
|
Div({ classes("text-center") }) {
|
||||||
@@ -44,7 +181,7 @@ fun HomePage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
// CTA buttons
|
// CTA buttons
|
||||||
Div({ classes("d-flex", "justify-content-center", "gap-2", "mb-4") }) {
|
Div({ classes("d-flex", "justify-content-center", "gap-2", "mb-2") }) {
|
||||||
A(attrs = {
|
A(attrs = {
|
||||||
classes("btn", "btn-primary", "btn-lg")
|
classes("btn", "btn-primary", "btn-lg")
|
||||||
attr("href", "#/docs/tutorial.md")
|
attr("href", "#/docs/tutorial.md")
|
||||||
@@ -72,48 +209,26 @@ fun HomePage() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Code sample
|
// Code sample slideshow
|
||||||
val code = """
|
Div({
|
||||||
// Create, transform, and verify — the Lyng way
|
classes("markdown-body", "mt-0", "slide-container", "position-relative")
|
||||||
import lyng.stdlib
|
onClick {
|
||||||
|
window.location.hash = "#tryling?code=" + encodeURIComponent(samples[currentSlide])
|
||||||
fun findFirstPositive(list) {
|
|
||||||
list.forEach {
|
|
||||||
if (it > 0) return@findFirstPositive it
|
|
||||||
}
|
}
|
||||||
null
|
}) {
|
||||||
|
Small({
|
||||||
|
classes("position-absolute", "top-0", "end-0", "m-2", "text-muted", "fw-light", "try-hint")
|
||||||
|
}) {
|
||||||
|
Text("click to try")
|
||||||
}
|
}
|
||||||
assertEquals(42, findFirstPositive([-1, 42, -5]))
|
key(currentSlide) {
|
||||||
|
val slideCode = samples[currentSlide]
|
||||||
val data = 1..5 // or [1,2,3,4,5]
|
val mapHtml = "<pre><code>" + htmlEscape(slideCode) + "</code></pre>"
|
||||||
val evens2 = data.filter { it % 2 == 0 }.map { it * it }
|
Div({ classes("slide-animation") }) {
|
||||||
assertEquals([4, 16], evens2)
|
|
||||||
|
|
||||||
// Map literal with identifier keys, shorthand, and spread
|
|
||||||
val base = { a: 1, b: 2 }
|
|
||||||
val patch = { b: 3, c: }
|
|
||||||
val m = { "a": 0, ...base, ...patch, d: 4 }
|
|
||||||
assertEquals(1, m["a"]) // base overwrites 0
|
|
||||||
|
|
||||||
// Object expressions: anonymous classes on the fly
|
|
||||||
val worker = object : Runnable {
|
|
||||||
override fun run() = println("Working...")
|
|
||||||
}
|
|
||||||
worker.run()
|
|
||||||
|
|
||||||
// User-defined exceptions: real classes with custom fields
|
|
||||||
class MyError(val code, m) : Exception(m)
|
|
||||||
try {
|
|
||||||
throw MyError(500, "Something failed")
|
|
||||||
} catch (e: MyError) {
|
|
||||||
println("Error " + e.code + ": " + e.message)
|
|
||||||
}
|
|
||||||
>>> void
|
|
||||||
""".trimIndent()
|
|
||||||
val mapHtml = "<pre><code>" + htmlEscape(code) + "</code></pre>"
|
|
||||||
Div({ classes("markdown-body", "mt-3") }) {
|
|
||||||
UnsafeRawHtml(highlightLyngHtml(ensureBootstrapCodeBlocks(mapHtml)))
|
UnsafeRawHtml(highlightLyngHtml(ensureBootstrapCodeBlocks(mapHtml)))
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
// Short features list
|
// Short features list
|
||||||
Div({ classes("row", "g-4", "mt-1") }) {
|
Div({ classes("row", "g-4", "mt-1") }) {
|
||||||
@@ -147,3 +262,36 @@ try {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun ensureSlideshowStyles() {
|
||||||
|
if (window.document.getElementById("slideshow-styles") != null) return
|
||||||
|
val style = window.document.createElement("style") as org.w3c.dom.HTMLStyleElement
|
||||||
|
style.id = "slideshow-styles"
|
||||||
|
style.textContent = """
|
||||||
|
@keyframes slideIn {
|
||||||
|
from { opacity: 0; transform: translateX(30px); }
|
||||||
|
to { opacity: 1; transform: translateX(0); }
|
||||||
|
}
|
||||||
|
.slide-animation {
|
||||||
|
animation: slideIn 0.4s ease-out;
|
||||||
|
}
|
||||||
|
.slide-container {
|
||||||
|
min-height: 320px;
|
||||||
|
cursor: pointer;
|
||||||
|
transition: transform 0.2s;
|
||||||
|
background-color: var(--bs-body-bg);
|
||||||
|
}
|
||||||
|
.slide-container:hover {
|
||||||
|
transform: scale(1.005);
|
||||||
|
}
|
||||||
|
.try-hint {
|
||||||
|
opacity: 0.5;
|
||||||
|
transition: opacity 0.2s;
|
||||||
|
pointer-events: none;
|
||||||
|
}
|
||||||
|
.slide-container:hover .try-hint {
|
||||||
|
opacity: 1;
|
||||||
|
}
|
||||||
|
""".trimIndent()
|
||||||
|
window.document.head!!.appendChild(style)
|
||||||
|
}
|
||||||
Loaded 100 of 102 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user