unsuccussful navigation; we stop at this point

.gitignore

@@ -20,4 +20,3 @@ xcuserdata
 .output*.txt
 debug.log
 /build.log
-/test.md

CHANGELOG.md

@@ -2,15 +2,6 @@
 
 ### Unreleased
 
-- Language: Abstract Classes and Interfaces
-  - Support for `abstract` modifier on classes, methods, and variables.
-  - Introduced `interface` as a synonym for `abstract class`, supporting full state (constructors, fields, `init` blocks) and implementation by parts via MI.
-  - New `closed` modifier (antonym to `open`) to prevent overriding class members.
-  - Refined `override` logic: mandatory keyword when re-declaring members that exist in the ancestor chain (MRO).
-  - 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.
-  - Documentation: Updated `docs/OOP.md` with sections on "Abstract Classes and Members", "Interfaces", and "Overriding and Virtual Dispatch".
-
 - Language: Class properties with accessors
   - Support for `val` (read-only) and `var` (read-write) properties in classes.
   - Syntax: `val name [ : Type ] get() { body }` or `var name [ : Type ] get() { body } set(value) { body }`.
@@ -20,22 +11,7 @@
   - Integration: Updated TextMate grammar and IntelliJ plugin (highlighting + keywords).
   - Documentation: New "Properties" section in `docs/OOP.md`.
 
-- Language: Restricted Setter Visibility
+- Docs: Scopes and Closures guidance
-  - Support for `private set` and `protected set` modifiers on `var` fields and properties.
-  - Allows members to be publicly readable but only writable from within the declaring class or its subclasses.
-  - Enforcement at runtime: throws `AccessException` on unauthorized writes.
-  - Supported only for declarations in class bodies (fields and properties).
-  - Documentation: New "Restricted Setter Visibility" section in `docs/OOP.md`.
-
-- Language: Late-initialized `val` fields in classes
-  - Support for declaring `val` without an immediate initializer in class bodies.
-  - Compulsory initialization: every late-init `val` must be assigned at least once within the class body or an `init` block.
-  - Write-once enforcement: assigning to a `val` is allowed only if its current value is `Unset`.
-  - Access protection: reading a late-init `val` before it is assigned returns the `Unset` singleton; using `Unset` for most operations throws an `UnsetException`.
-  - Extension properties do not support late-init.
-  - Documentation: New "Late-initialized `val` fields" and "The `Unset` singleton" sections in `docs/OOP.md`.
-
-- Docs: OOP improvements
   - New page: `docs/scopes_and_closures.md` detailing `ClosureScope` resolution order, recursion‑safe helpers (`chainLookupIgnoreClosure`, `chainLookupWithMembers`, `baseGetIgnoreClosure`), cycle prevention, and capturing lexical environments for callbacks (`snapshotForClosure`).
   - Updated: `docs/advanced_topics.md` (link to the new page), `docs/parallelism.md` (closures in `launch`/`flow`), `docs/OOP.md` (visibility from closures with preserved `currentClassCtx`), `docs/exceptions_handling.md` (compatibility alias `SymbolNotFound`).
   - Tutorial: added quick link to Scopes and Closures.
@@ -107,9 +83,6 @@ All notable changes to this project will be documented in this file.
   - Mutually exclusive: `--check` and `--in-place` together now produce an error and exit with code 1.
   - Multi-file stdout prints headers `--- <path> ---` per file.
   - `lyng --help` shows `fmt`; `lyng fmt --help` displays dedicated help.
-  - Fix: Property accessors (`get`, `set`, `private set`, `protected set`) are now correctly indented relative to the property declaration.
-  - Fix: Indentation now correctly carries over into blocks that start on extra‑indented lines (e.g., nested `if` statements or property accessor bodies).
-  - Fix: Formatting Markdown files no longer deletes content in `.lyng` code fences and works correctly with injected files (resolves clobbering, `StringIndexOutOfBoundsException`, and `nonempty text is not covered by block` errors).
 
 - CLI: Preserved legacy script invocation fast-paths:
   - `lyng script.lyng [args...]` executes the script directly.

docs/OOP.md

@@ -42,35 +42,6 @@ a _constructor_ that requires two parameters for fields. So when creating it wit
 Form now on `Point` is a class, it's type is `Class`, and we can create instances with it as in the
 example above.
 
-## Singleton Objects
-
-Singleton objects are declared using the `object` keyword. An `object` declaration defines both a class and a single instance of that class at the same time. This is perfect for stateless utilities, global configuration, or shared delegates.
-
-```lyng
-object Config {
-    val version = "1.0.0"
-    val debug = true
-    
-    fun printInfo() {
-        println("App version: " + version)
-    }
-}
-
-// Usage:
-println(Config.version)
-Config.printInfo()
-```
-
-Objects can also inherit from classes or interfaces:
-
-```lyng
-object DefaultLogger : Logger("Default") {
-    override fun log(msg) {
-        println("[DEFAULT] " + msg)
-    }
-}
-```
-
 ## Properties
 
 Properties allow you to define member accessors that look like fields but execute code when read or written. Unlike regular fields, properties in Lyng do **not** have automatic backing fields; they are pure accessors.
@@ -79,7 +50,7 @@ Properties allow you to define member accessors that look like fields but execut
 
 Properties are declared using `val` (read-only) or `var` (read-write) followed by a name and `get()`/`set()` blocks:
 
-```lyng
+```kotlin
 class Person(private var _age: Int) {
     // Read-only property
     val ageCategory 
@@ -105,7 +76,7 @@ assertEquals("Adult", p.ageCategory)
 
 For simple accessors and methods, you can use the `=` shorthand for a more elegant and laconic form:
 
-```lyng
+```kotlin
 class Circle(val radius: Real) {
     val area get() = π * radius * radius
     val circumference get() = 2 * π * radius
@@ -129,61 +100,6 @@ class Counter {
 - **No Backing Fields**: There is no magic `field` identifier. If you need to store state, you must declare a separate (usually `private`) field.
 - **Type Inference**: You can omit the type declaration if it can be inferred or if you don't need strict typing.
 
-### Lazy Properties with `cached`
-
-When you want to define a property that is computed only once (on demand) and then remembered, use the built-in `cached` function. This is more efficient than a regular property with `get()` if the computation is expensive, as it avoids re-calculating the value on every access.
-
-```lyng
-class DataService(val id: Int) {
-    // The lambda passed to cached is only executed once, the first time data() is called.
-    val data = cached {
-        println("Fetching data for " + id)
-        // Perform expensive operation
-        "Record " + id
-    }
-}
-
-val service = DataService(42)
-// No printing yet
-println(service.data()) // Prints "Fetching data for 42", then returns "Record 42"
-println(service.data()) // Returns "Record 42" immediately (no second fetch)
-```
-
-Note that `cached` returns a lambda, so you access the value by calling it like a method: `service.data()`. This is a powerful pattern for lazy-loading resources, caching results of database queries, or delaying expensive computations until they are truly needed.
-
-## Delegation
-
-Delegation allows you to hand over the logic of a property or function to another object. This is done using the `by` keyword.
-
-### Property Delegation
-
-Instead of providing `get()` and `set()` accessors, you can delegate them to an object that implements the `getValue` and `setValue` methods.
-
-```lyng
-class User {
-    var name by MyDelegate()
-}
-```
-
-### Function Delegation
-
-You can also delegate a whole function to an object. When the function is called, it will invoke the delegate's `invoke` method.
-
-```lyng
-fun remoteAction by RemoteProxy("actionName")
-```
-
-### The Unified Delegate Interface
-
-A delegate is any object that provides the following methods (all optional depending on usage):
-
-- `getValue(thisRef, name)`: Called when a delegated `val` or `var` is read.
-- `setValue(thisRef, name, newValue)`: Called when a delegated `var` is written.
-- `invoke(thisRef, name, args...)`: Called when a delegated `fun` is invoked.
-- `bind(name, access, thisRef)`: Called once during initialization to configure or validate the delegate.
-
-For more details and advanced patterns (like `lazy`, `observable`, and shared stateless delegates), see the [Delegation Guide](delegation.md).
-
 ## Instance initialization: init block
 
 In addition to the primary constructor arguments, you can provide an `init` block that runs on each instance creation. This is useful for more complex initializations, side effects, or setting up fields that depend on multiple constructor parameters.
@@ -237,44 +153,6 @@ statements discussed later, there could be default values, ellipsis, etc.
 
 Note that unlike **Kotlin**, which uses `=` for named arguments, Lyng uses `:` to avoid ambiguity with assignment expressions.
 
-### Late-initialized `val` fields
-
-You can declare a `val` field without an immediate initializer if you provide an assignment for it within an `init` block or the class body. This is useful when the initial value depends on logic that cannot be expressed in a single expression.
-
-```lyng
-class DataProcessor(data: Object) {
-    val result: Object
-    
-    init {
-        // Complex initialization logic
-        result = transform(data)
-    }
-}
-```
-
-Key rules for late-init `val`:
-- **Compile-time Check**: The compiler ensures that every `val` declared without an initializer in a class body has at least one assignment within that class body (including `init` blocks). Failing to do so results in a syntax error.
-- **Write-Once**: A `val` can only be assigned once. Even if it was declared without an initializer, once it is assigned a value (e.g., in `init`), any subsequent assignment will throw an `IllegalAssignmentException`.
-- **Access before Initialization**: If you attempt to read a late-init `val` before it has been assigned (for example, by calling a method in `init` that reads the field before its assignment), it will hold a special `Unset` value. Using `Unset` for most operations (like arithmetic or method calls) will throw an `UnsetException`.
-- **No Extensions**: Extension properties do not support late initialization as they do not have per-instance storage. Extension `val`s must always have an initializer or a `get()` accessor.
-
-### The `Unset` singleton
-
-The `Unset` singleton represents a field that has been declared but not yet initialized. While it can be compared and converted to a string, most other operations on it are forbidden to prevent accidental use of uninitialized data.
-
-```lyng
-class T {
-    val x
-    fun check() {
-        if (x == Unset) println("Not ready")
-    }
-    init {
-        check() // Prints "Not ready"
-        x = 42
-    }
-}
-```
-
 ## Methods
 
 Functions defined inside a class body are methods, and unless declared
@@ -299,7 +177,7 @@ Functions defined inside a class body are methods, and unless declared
 
 Lyng supports declaring a class with multiple direct base classes. The syntax is:
 
-```lyng
+```
 class Foo(val a) {
     var tag = "F"
     fun runA() { "ResultA:" + a }
@@ -348,16 +226,16 @@ Key rules and features:
 
 - Syntax
   - `class Derived(args) : Base1(b1Args), Base2(b2Args)`
-  - Each direct base may receive constructor arguments specified in the header. Only direct bases receive header args; indirect bases must either be default‑constructible or receive their args through their direct child.
+  - Each direct base may receive constructor arguments specified in the header. Only direct bases receive header args; indirect bases must either be default‑constructible or receive their args through their direct child (future extensions may add more control).
 
-- Resolution order (C3 MRO)
+- Resolution order (C3 MRO — active)
   - Member lookup is deterministic and follows C3 linearization (Python‑like), which provides a monotonic, predictable order for complex hierarchies and diamonds.
   - Intuition: for `class D() : B(), C()` where `B()` and `C()` both derive from `A()`, the C3 order is `D → B → C → A`.
   - The first visible match along this order wins.
 
 - Qualified dispatch
   - Inside a class body, use `this@Type.member(...)` to start lookup at the specified ancestor.
-  - For arbitrary receivers, use casts: `(expr as Type).member(...)` or `(expr as? Type)?.member(...)`.
+  - For arbitrary receivers, use casts: `(expr as Type).member(...)` or `(expr as? Type)?.member(...)` (safe‑call `?.` is already available in Lyng).
   - Qualified access does not relax visibility.
 
 - Field inheritance (`val`/`var`) and collisions
@@ -374,120 +252,10 @@ Key rules and features:
   - `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.
 
-## Abstract Classes and Members
+- Diagnostics
-
+  - When a member/field is not found, error messages include the receiver class name and the considered linearization order, with suggestions to disambiguate using `this@Type` or casts if appropriate.
-An `abstract` class is a class that cannot be instantiated and is intended to be inherited by other classes. It can contain `abstract` members that have no implementation and must be implemented by concrete subclasses.
+  - Qualifying with a non‑ancestor in `this@Type` reports a clear error mentioning the receiver lineage.
-
+  - `as`/`as?` cast errors mention the actual and target types.
-### Abstract Classes
-
-To declare an abstract class, use the `abstract` modifier:
-
-```lyng
-abstract class Shape {
-    abstract fun area(): Real
-}
-```
-
-Abstract classes can have constructors, fields, and concrete methods, just like regular classes.
-
-### Abstract Members
-
-Methods and variables (`val`/`var`) can be marked as `abstract`. Abstract members must not have a body or initializer.
-
-```lyng
-abstract class Base {
-    abstract fun foo(): Int
-    abstract var bar: String
-}
-```
-
-- **Safety**: `abstract` members cannot be `private`, as they must be visible to subclasses for implementation.
-- **Contract of Capability**: An `abstract val/var` represents a requirement for a capability. It can be implemented by either a **field** (storage) or a **property** (logic) in a subclass.
-
-## Interfaces
-
-An `interface` in Lyng is a synonym for an `abstract class`. Following the principle that Lyng's Multiple Inheritance system is powerful enough to handle stateful contracts, interfaces support everything classes do, including constructors, fields, and `init` blocks.
-
-```lyng
-interface Named(val name: String) {
-    fun greet() { "Hello, " + name }
-}
-
-class Person(name) : Named(name)
-```
-
-Using `interface` instead of `abstract class` is a matter of semantic intent, signaling that the class is primarily intended to be used as a contract in MI.
-
-### Implementation by Parts
-
-One of the most powerful benefits of Lyng's Multiple Inheritance and C3 MRO is the ability to satisfy an interface's requirements "by parts" from different parent classes. Since an `interface` can have state and requirements, a subclass can inherit these requirements and satisfy them using members inherited from other parents in the MRO chain.
-
-Example:
-
-```lyng
-// Interface with state (id) and abstract requirements
-interface Character(val id) {
-    var health
-    var mana
-    
-    fun isAlive() = health > 0
-    fun status() = name + " (#" + id + "): " + health + " HP, " + mana + " MP"
-}
-
-// Parent class 1: provides health
-class HealthPool(var health)
-
-// Parent class 2: provides mana and name
-class ManaPool(var mana) {
-    val name = "Hero"
-}
-
-// Composite class: implements Character by combining HealthPool and ManaPool
-class Warrior(id, h, m) : HealthPool(h), ManaPool(m), Character(id)
-
-val w = Warrior(1, 100, 50)
-assertEquals("Hero (#1): 100 HP, 50 MP", w.status())
-```
-
-In this example, `Warrior` inherits from `HealthPool`, `ManaPool`, and `Character`. The abstract requirements `health` and `mana` from `Character` are automatically satisfied by the matching members inherited from `HealthPool` and `ManaPool`. The `status()` method also successfully finds the `name` field from `ManaPool`. This pattern allows for highly modular and reusable "trait-like" classes that can be combined to fulfill complex contracts without boilerplate proxy methods.
-
-## Overriding and Virtual Dispatch
-
-When a class defines a member that already exists in one of its parents, it is called **overriding**.
-
-### The `override` Keyword
-
-In Lyng, the `override` keyword is **mandatory when declaring a member** that exists in the ancestor chain (MRO).
-
-```lyng
-class Parent {
-    fun foo() = 1
-}
-
-class Child : Parent() {
-    override fun foo() = 2 // Mandatory override keyword
-}
-```
-
-- **Implicit Satisfaction**: If a class inherits an abstract requirement and a matching implementation from different parents, the requirement is satisfied automatically without needing an explicit `override` proxy.
-- **No Accidental Overrides**: If you define a member that happens to match a parent's member but you didn't use `override`, the compiler will throw an error. This prevents the "Fragile Base Class" problem.
-- **Private Members**: Private members in parent classes are NOT part of the virtual interface and cannot be overridden. Defining a member with the same name in a subclass is allowed without `override` and is treated as a new, independent member.
-
-### Visibility Widening
-
-A subclass can increase the visibility of an overridden member (e.g., `protected` → `public`), but it is strictly forbidden from narrowing it (e.g., `public` → `protected`).
-
-### The `closed` Modifier
-
-To prevent a member from being overridden in subclasses, use the `closed` modifier (equivalent to `final` in other languages).
-
-```lyng
-class Critical {
-    closed fun secureStep() { ... }
-}
-```
-
-Attempting to override a `closed` member results in a compile-time error.
 
 Compatibility notes:
 
@@ -604,69 +372,6 @@ Are declared with var
     assert( p.isSpecial == true )
     >>> void
 
-### Restricted Setter Visibility
-
-You can restrict the visibility of a `var` field's or property's setter by using `private set` or `protected set` modifiers. This allows the member to be publicly readable but only writable from within the class or its subclasses.
-
-#### On Fields
-
-```lyng
-class SecretCounter {
-    var count = 0
-        private set // Can be read anywhere, but written only in SecretCounter
-        
-    fun increment() { count++ }
-}
-
-val c = SecretCounter()
-println(c.count) // OK
-c.count = 10     // Throws IllegalAccessException
-c.increment()    // OK
-```
-
-#### On Properties
-
-You can also apply restricted visibility to custom property setters:
-
-```lyng
-class Person(private var _age: Int) {
-    var age
-        get() = _age
-        private set(v) { if (v >= 0) _age = v }
-}
-```
-
-#### Protected Setters and Inheritance
-
-A `protected set` allows subclasses to modify a field that is otherwise read-only to the public:
-
-```lyng
-class Base {
-    var state = "initial"
-        protected set
-}
-
-class Derived : Base() {
-    fun changeState(newVal) {
-        state = newVal // OK: protected access from subclass
-    }
-}
-
-val d = Derived()
-println(d.state) // OK: "initial"
-d.changeState("updated")
-println(d.state) // OK: "updated"
-d.state = "bad"  // Throws IllegalAccessException: public write not allowed
-```
-
-### Key Rules and Limitations
-
-- **Only for `var`**: Restricted setter visibility cannot be used with `val` declarations, as they are inherently read-only. Attempting to use it with `val` results in a syntax error.
-- **Class Body Only**: These modifiers can only be used on members declared within the class body. They are not supported for primary constructor parameters.
-- **`private set`**: The setter is only accessible within the same class context (specifically, when `this` is an instance of that class).
-- **`protected set`**: The setter is accessible within the declaring class and all its transitive subclasses.
-- **Multiple Inheritance**: In MI scenarios, visibility is checked against the class that actually declared the member. Qualified access (e.g., `this@Base.field = value`) also respects restricted setter visibility.
-
 ### Private fields
 
 Private fields are visible only _inside the class instance_:
@@ -823,7 +528,7 @@ Just like methods, you can extend existing classes with properties. These can be
 
 A read-only extension can be defined by assigning an expression:
 
-```lyng
+```kotlin
 val String.isLong = length > 10
 
 val s = "Hello, world!"
@@ -834,7 +539,7 @@ assert(s.isLong)
 
 For more complex logic, use `get()` and `set()` blocks:
 
-```lyng
+```kotlin
 class Box(var value: Int)
 
 var Box.doubledValue
@@ -857,7 +562,7 @@ Extensions in Lyng are **scope-isolated**. This means an extension is only visib
 
 You can define different extensions with the same name in different scopes:
 
-```lyng
+```kotlin
 fun scopeA() {
     val Int.description = "Number: " + toString()
     assertEquals("Number: 42", 42.description)
@@ -994,12 +699,12 @@ request](https://gitea.sergeych.net/SergeychWorks/lyng/issues).
 - ObjClass sole parent is Obj
 - ObjClass contains code for instance methods, class fields, hierarchy information.
 - Class information is also scoped. 
-- We avoid imported classes duplication using packages and import caching, so the same imported module is the same object in all its classes.
+- We acoid imported classes duplication using packages and import caching, so the same imported module is the same object in all its classes.
 
 ## Instances
 
 Result of executing of any expression or statement in the Lyng is the object that
-inherits `Obj`, but is not `Obj`. For example, it could be Int, void, null, real, string, bool, etc.
+inherits `Obj`, but is not `Obj`. For example it could be Int, void, null, real, string, bool, etc.
 
 This means whatever expression returns or the variable holds, is the first-class
 object, no differenes. For example:

docs/Testing.md

@@ -93,6 +93,8 @@ If we want to evaluate the message lazily:
 
 In this case, formatting will only occur if the condition is not met.
 
+
+
 ### `check`
 
     check(condition, message="check failed")
@@ -105,17 +107,3 @@ With lazy message evaluation:
 
 In this case, formatting will only occur if the condition is not met.
 
-### TODO
-
-It is easy to mark some code and make it throw a special exception at cone with:
-
-    TODO()
-
-or
-
-    TODO("some message")
-
-It raises an `NotImplementedException` with the given message. You can catch it
-as any other exception when necessary.
-
-Many IDE and editors have built-in support for marking code with TODOs.

docs/ai_notes_wasm_generation_bug.md

@@ -1,15 +0,0 @@
-# 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.

docs/delegation.md

@@ -1,175 +0,0 @@
-# Delegation in Lyng
-
-Delegation is a powerful pattern that allows you to outsource the logic of properties (`val`, `var`) and functions (`fun`) to another object. This enables code reuse, separation of concerns, and the implementation of common patterns like lazy initialization, observable properties, and remote procedure calls (RPC) with minimal boilerplate.
-
-## The `by` Keyword
-
-Delegation is triggered using the `by` keyword in a declaration. The expression following `by` is evaluated once when the member is initialized, and the resulting object becomes the **delegate**.
-
-```lyng
-val x by MyDelegate()
-var y by MyDelegate()
-fun f by MyDelegate()
-```
-
-## The Unified Delegate Model
-
-A delegate object can implement any of the following methods to intercept member access. All methods receive the `thisRef` (the instance containing the member) and the `name` of the member.
-
-```lyng
-interface Delegate {
-    // Called when a 'val' or 'var' is read
-    fun getValue(thisRef, name)
-    
-    // Called when a 'var' is assigned
-    fun setValue(thisRef, name, newValue)
-    
-    // Called when a 'fun' is invoked
-    fun invoke(thisRef, name, args...)
-    
-    // Optional: Called once during initialization to "bind" the delegate
-    // Can be used for validation or to return a different delegate instance
-    fun bind(name, access, thisRef) = this
-}
-```
-
-### Delegate Access Types
-
-The `bind` method receives an `access` parameter of type `DelegateAccess`, which can be one of:
-- `DelegateAccess.Val`
-- `DelegateAccess.Var`
-- `DelegateAccess.Callable` (for `fun`)
-
-## Usage Cases and Examples
-
-### 1. Lazy Initialization
-
-The classic `lazy` pattern ensures a value is computed only when first accessed and then cached. In Lyng, `lazy` is implemented as a class that follows this pattern. While classes typically start with an uppercase letter, `lazy` is an exception to make its usage feel like a native language feature.
-
-```lyng
-class lazy(val creator) : Delegate {
-    private var value = Unset
-
-    override fun bind(name, access, thisRef) {
-        if (access != DelegateAccess.Val) throw "lazy delegate can only be used with 'val'"
-        this
-    }
-
-    override fun getValue(thisRef, name) {
-        if (value == Unset) {
-            value = creator()
-        }
-        value
-    }
-}
-
-// Usage:
-val expensiveData by lazy {
-    println("Performing expensive computation...")
-    42
-}
-
-println(expensiveData) // Computes and prints 42
-println(expensiveData) // Returns 42 immediately
-```
-
-### 2. Observable Properties
-
-Delegates can be used to react to property changes.
-
-```lyng
-class Observable(initialValue, val onChange) {
-    private var value = initialValue
-
-    fun getValue(thisRef, name) = value
-    
-    fun setValue(thisRef, name, newValue) {
-        val oldValue = value
-        value = newValue
-        onChange(name, oldValue, newValue)
-    }
-}
-
-class User {
-    var name by Observable("Guest") { name, old, new ->
-        println("Property %s changed from %s to %s"(name, old, new))
-    }
-}
-
-val u = User()
-u.name = "Alice" // Prints: Property name changed from Guest to Alice
-```
-
-### 3. Function Delegation (Proxies)
-
-You can delegate an entire function to an object. This is particularly useful for implementing decorators or RPC clients.
-
-```lyng
-object LoggerDelegate {
-    fun invoke(thisRef, name, args...) {
-        println("Calling function: " + name + " with args: " + args)
-        // Logic here...
-        "Result of " + name
-    }
-}
-
-fun remoteAction by LoggerDelegate
-
-println(remoteAction(1, 2, 3))
-// Prints: Calling function: remoteAction with args: [1, 2, 3]
-// Prints: Result of remoteAction
-```
-
-### 4. Stateless Delegates (Shared Singletons)
-
-Because `getValue`, `setValue`, and `invoke` receive `thisRef`, a single object can act as a delegate for multiple properties across many instances without any per-property memory overhead.
-
-```lyng
-object Constant42 {
-    fun getValue(thisRef, name) = 42
-}
-
-class Foo {
-    val a by Constant42
-    val b by Constant42
-}
-
-val f = Foo()
-assertEquals(42, f.a)
-assertEquals(42, f.b)
-```
-
-### 5. Local Delegation
-
-Delegation is not limited to class members; you can also use it for local variables inside functions.
-
-```lyng
-fun test() {
-    val x by LocalProxy(123)
-    println(x)
-}
-```
-
-## The `bind` Hook
-
-The `bind(name, access, thisRef)` method is called exactly once when the member is being initialized. It allows the delegate to:
-1.  **Validate usage**: Throw an error if the delegate is used with the wrong member type (e.g., `lazy` on a `var`).
-2.  **Initialize state**: Set up internal state based on the property name or the containing instance.
-3.  **Substitute itself**: Return a different object that will act as the actual delegate.
-
-```lyng
-class ValidatedDelegate() {
-    fun bind(name, access, thisRef) {
-        if (access == DelegateAccess.Var) {
-            throw "This delegate cannot be used with 'var'"
-        }
-        this
-    }
-    
-    fun getValue(thisRef, name) = "Validated"
-}
-```
-
-## Summary
-
-Delegation in Lyng combines the elegance of Kotlin-style properties with the flexibility of dynamic function interception. By unifying `val`, `var`, and `fun` delegation into a single model, Lyng provides a consistent and powerful tool for meta-programming and code reuse.

docs/exceptions_handling.md

@@ -136,7 +136,7 @@ Serializable class that conveys information about the exception. Important membe
 
 A simple structire that stores single entry in Lyng stack, it is created automatically on exception creation:
 
-```lyng
+```kotlin
 class StackTraceEntry(
     val sourceName: String,
     val line: Int,
@@ -165,7 +165,7 @@ _this functionality is not yet released_
 | IllegalAssignmentException | assigning to val, etc.                                |
 | SymbolNotDefinedException  |                                                       |
 | IterationEndException      | attempt to read iterator past end, `hasNext == false` |
-| IllegalAccessException     | attempt to access private members or like             |
+| AccessException            | attempt to access private members or like             |
 | UnknownException           | unexpected kotlin exception caught                    |
 |                            |                                                       |
 

docs/scopes_and_closures.md

@@ -68,26 +68,6 @@ Tip: If a closure unexpectedly cannot see an outer local, check whether an inter
 - The `visited` sets used for cycle detection are tiny and short‑lived; in typical scripts the overhead is negligible.
 - If profiling shows hotspots, consider limiting ancestry depth in your custom helpers or using small fixed arrays instead of hash sets—only for extremely hot code paths.
 
-## Practical Example: `cached`
-
-The `cached` function (defined in `lyng.stdlib`) is a classic example of using closures to maintain state. It wraps a builder into a zero-argument function that computes once and remembers the result:
-
-```lyng
-fun cached(builder) {
-    var calculated = false
-    var value = null
-    { // This lambda captures `calculated`, `value`, and `builder`
-        if( !calculated ) {
-            value = builder()
-            calculated = true
-        }
-        value
-    }
-}
-```
-
-Because Lyng now correctly isolates closures for each evaluation of a lambda literal, using `cached` inside a class instance works as expected: each instance maintains its own private `calculated` and `value` state, even if they share the same property declaration.
-
 ## Dos and Don’ts
 - Do use `chainLookupIgnoreClosure` / `chainLookupWithMembers` for ancestry traversals.
 - Do maintain the resolution order above for predictable behavior.

docs/tutorial.md

@@ -87,27 +87,6 @@ Lyng supports simple enums for a fixed set of named constants. Declare with `enu
 
 For more details (usage patterns, `when` switching, serialization), see OOP notes: [Enums in detail](OOP.md#enums).
 
-## Singleton Objects
-
-Singleton objects are declared using the `object` keyword. They define a class and create its single instance immediately.
-
-    object Logger {
-        fun log(msg) { println("[LOG] " + msg) }
-    }
-    
-    Logger.log("Hello singleton!")
-
-## Delegation (briefly)
-
-You can delegate properties and functions to other objects using the `by` keyword. This is perfect for patterns like `lazy` initialization.
-
-    val expensiveData by lazy {
-        // computed only once on demand
-        "computed"
-    }
-
-For more details on these features, see [Delegation in Lyng](delegation.md) and [OOP notes](OOP.md).
-
 When putting multiple statments in the same line it is convenient and recommended to use `;`:
 
     var from; var to
@@ -1518,7 +1497,7 @@ See [math functions](math.md). Other general purpose functions are:
 | print(args...)                        | Open for overriding, it prints to stdout without newline.  |
 | flow {}                               | create flow sequence, see [parallelism]                    |
 | delay, launch, yield                  | see [parallelism]                                          |
-| cached(builder)                       | [Lazy evaluation with `cached`](#lazy-evaluation-with-cached) |
+| cached(builder)                       | remembers builder() on first invocation and return it then |
 | let, also, apply, run                 | see above, flow controls                                   |
 
 (1)
@@ -1566,50 +1545,6 @@ Lambda avoid unnecessary execution if assertion is not failed. for example:
 
 [Regex]: Regex.md
 
-## Lazy evaluation with `cached`
-
-Sometimes you have an expensive computation that you only want to perform if and when it is actually needed, and then remember (cache) the result for all future calls. Lyng provides the `cached(builder)` function for this purpose.
-
-It is extremely simple to use: you pass it a block (lambda) that performs the computation, and it returns a zero-argument function that manages the caching for you.
-
-### Basic Example
-
-```lyng
-val expensive = cached {
-    println("Performing expensive calculation...")
-    2 + 2
-}
-
-println(expensive()) // Prints "Performing expensive calculation...") then "4"
-println(expensive()) // Prints only "4" (result is cached)
-```
-
-### Benefits and Simplicity
-
-1.  **Lazy Execution:** The code inside the `cached` block doesn't run until you actually call the resulting function.
-2.  **Automatic State Management:** You don't need to manually check if a value has been computed or store it in a separate variable.
-3.  **Closures and Class Support:** `cached` works perfectly with closures. If you use it inside a class, it will correctly capture the instance variables, and each instance will have its own independent cache.
-
-### Use Case: Lazy Properties in Classes
-
-This is the most common use case for `cached`. It allows you to define expensive "fields" that are only computed if someone actually uses them:
-
-```lyng
-class User(val id: Int) {
-    // The details will be fetched only once, on demand
-    val details = cached {
-        println("Fetching details for user " + id)
-        // Db.query is a hypothetical example
-        Db.query("SELECT * FROM users WHERE id = " + id)
-    }
-}
-
-val u = User(101)
-// ... nothing happens yet ...
-val d = u.details() // Computation happens here
-val sameD = u.details() // Returns the same result immediately
-```
-
 ## Multiple Inheritance (quick start)
 
 Lyng supports multiple inheritance (MI) with simple, predictable rules. For a full reference see OOP notes, this is a quick, copy‑paste friendly overview.

docs/wasm_generation_bug.md

@@ -1,27 +0,0 @@
-# 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.

docs/whats_new.md

@@ -1,140 +0,0 @@
-# What's New in Lyng
-
-This document highlights the latest additions and improvements to the Lyng language and its ecosystem.
-
-## Language Features
-
-### Class Properties with Accessors
-Classes now support properties with custom `get()` and `set()` accessors. Properties in Lyng do **not** have automatic backing fields; they are pure accessors.
-
-```lyng
-class Person(private var _age: Int) {
-    // Read-only property
-    val ageCategory get() = if (_age < 18) "Minor" else "Adult"
-
-    // Read-write property
-    var age: Int
-        get() = _age
-        set(v) {
-            if (v >= 0) _age = v
-        }
-}
-```
-
-### 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.
-
-```lyng
-class Counter {
-    var count = 0
-        private set  // Field with private setter
-        
-    fun increment() { count++ }
-}
-
-class AdvancedCounter : Counter {
-    var totalOperations = 0
-        protected set // Settable here and in further subclasses
-}
-
-let c = Counter()
-c.increment() // OK
-// c.count = 10 // Error: setter is private
-```
-
-### Late-initialized `val` Fields
-`val` fields in classes can be declared without an immediate initializer, provided they are assigned exactly once. If accessed before initialization, they hold the special `Unset` singleton.
-
-```lyng
-class Service {
-    val logger
-    
-    fun check() {
-        if (logger == Unset) println("Not initialized yet")
-    }
-
-    init {
-        logger = Logger("Service")
-    }
-}
-```
-
-### Named Arguments and Named Splats
-Function calls now support named arguments using the `name: value` syntax. If the variable name matches the parameter name, you can use the `name:` shorthand.
-
-```lyng
-fun greet(name, greeting = "Hello") {
-    println("$greeting, $name!")
-}
-
-val name = "Alice"
-greet(name:)                  // Shorthand for greet(name: name)
-greet(greeting: "Hi", name: "Bob")
-
-let params = { name: "Charlie", greeting: "Hey")
-greet(...params)              // Named splat expansion
-```
-
-### Multiple Inheritance (MI)
-Lyng now supports multiple inheritance using the C3 Method Resolution Order (MRO). Use `this@Type` or casts for disambiguation.
-
-```lyng
-class A { fun foo() = "A" }
-class B { fun foo() = "B" }
-
-class Derived : A, B {
-    fun test() {
-        println(foo())              // Resolves to A.foo (leftmost)
-        println(this@B.foo())       // Qualified dispatch to B.foo
-    }
-}
-
-let d = Derived()
-println((d as B).foo())             // Disambiguation via cast
-```
-
-### Singleton Objects
-Singleton objects are declared using the `object` keyword. They provide a convenient way to define a class and its single instance in one go.
-
-```lyng
-object Config {
-    val version = "1.2.3"
-    fun show() = println("Config version: " + version)
-}
-
-Config.show()
-```
-
-### Unified Delegation Model
-A powerful new delegation system allows `val`, `var`, and `fun` members to delegate their logic to other objects using the `by` keyword.
-
-```lyng
-// Property delegation
-val lazyValue by lazy { "expensive" }
-
-// Function delegation
-fun remoteAction by myProxy
-
-// Observable properties
-var name by Observable("initial") { n, old, new -> 
-    println("Changed!") 
-}
-```
-
-The system features a unified interface (`getValue`, `setValue`, `invoke`) and a `bind` hook for initialization-time validation and configuration. See the [Delegation Guide](delegation.md) for more.
-
-## Tooling and Infrastructure
-
-### CLI: Formatting Command
-A new `fmt` subcommand has been added to the Lyng CLI.
-
-```bash
-lyng fmt MyFile.lyng             # Print formatted code to stdout
-lyng fmt --in-place MyFile.lyng  # Format file in-place
-lyng fmt --check MyFile.lyng     # Check if file needs formatting
-```
-
-### IDEA Plugin: Autocompletion
-Experimental lightweight autocompletion is now available in the IntelliJ plugin. It features type-aware member suggestions and inheritance-aware completion.
-
-You can enable it in **Settings | Lyng Formatter | Enable Lyng autocompletion**.

editors/lyng-textmate/README.md

@@ -20,7 +20,7 @@ Files
   - Constants: `true`, `false`, `null`, `this`
   - Annotations: `@name` (Unicode identifiers supported)
   - Labels: `name:` (Unicode identifiers supported)
-  - Declarations: highlights declared names in `fun|fn name`, `class|enum|interface Name`, `val|var name`
+  - Declarations: highlights declared names in `fun|fn name`, `class|enum Name`, `val|var name`
   - Types: built-ins (`Int|Real|String|Bool|Char|Regex`) and Capitalized identifiers (heuristic)
   - Operators including ranges (`..`, `..<`, `...`), null-safe (`?.`, `?[`, `?(`, `?{`, `?:`, `??`), arrows (`->`, `=>`, `::`), match operators (`=~`, `!~`), bitwise, arithmetic, etc.
   - Shuttle operator `<=>`

editors/lyng-textmate/package.json

@@ -2,7 +2,7 @@
   "name": "lyng-textmate",
   "displayName": "Lyng",
   "description": "TextMate grammar for the Lyng language (for JetBrains IDEs via TextMate Bundles and VS Code).",
-  "version": "0.1.0",
+  "version": "0.0.3",
   "publisher": "lyng",
   "license": "Apache-2.0",
   "engines": { "vscode": "^1.0.0" },

editors/lyng-textmate/syntaxes/lyng.tmLanguage.json

@@ -76,8 +76,8 @@
     },
     "labels": { "patterns": [ { "name": "entity.name.label.lyng", "match": "[\\p{L}_][\\p{L}\\p{N}_]*:" } ] },
     "directives": { "patterns": [ { "name": "meta.directive.lyng", "match": "^\\s*#[_A-Za-z][_A-Za-z0-9]*" } ] },
-    "declarations": { "patterns": [ { "name": "meta.function.declaration.lyng", "match": "\\b(fun|fn)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "entity.name.function.lyng" } } }, { "name": "meta.type.declaration.lyng", "match": "\\b(?:class|enum|interface)\\s+([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "entity.name.type.lyng" } } }, { "name": "meta.variable.declaration.lyng", "match": "\\b(val|var)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "variable.other.declaration.lyng" } } } ] },
+    "declarations": { "patterns": [ { "name": "meta.function.declaration.lyng", "match": "\\b(fun|fn)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "entity.name.function.lyng" } } }, { "name": "meta.type.declaration.lyng", "match": "\\b(?:class|enum)\\s+([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "entity.name.type.lyng" } } }, { "name": "meta.variable.declaration.lyng", "match": "\\b(val|var)\\s+(?:([\\p{L}_][\\p{L}\\p{N}_]*)\\.)?([\\p{L}_][\\p{L}\\p{N}_]*)", "captures": { "1": { "name": "keyword.declaration.lyng" }, "2": { "name": "entity.name.type.lyng" }, "3": { "name": "variable.other.declaration.lyng" } } } ] },
-    "keywords": { "patterns": [ { "name": "keyword.control.lyng", "match": "\\b(?:if|else|when|while|do|for|try|catch|finally|throw|return|break|continue)\\b" }, { "name": "keyword.declaration.lyng", "match": "\\b(?:fun|fn|class|enum|interface|val|var|import|package|constructor|property|abstract|override|open|closed|extern|private|protected|static|get|set)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\bnot\\s+(?:in|is)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\b(?:and|or|not|in|is|as|as\\?)\\b" } ] },
+    "keywords": { "patterns": [ { "name": "keyword.control.lyng", "match": "\\b(?:if|else|when|while|do|for|try|catch|finally|throw|return|break|continue)\\b" }, { "name": "keyword.declaration.lyng", "match": "\\b(?:fun|fn|class|enum|val|var|import|package|constructor|property|open|extern|private|protected|static|get|set)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\bnot\\s+(?:in|is)\\b" }, { "name": "keyword.operator.word.lyng", "match": "\\b(?:and|or|not|in|is|as|as\\?)\\b" } ] },
     "constants": { "patterns": [ { "name": "constant.language.lyng", "match": "(?:\\b(?:true|false|null|this)\\b|π)" } ] },
     "types": { "patterns": [ { "name": "storage.type.lyng", "match": "\\b(?:Int|Real|String|Bool|Char|Regex)\\b" }, { "name": "entity.name.type.lyng", "match": "\\b[A-Z][A-Za-z0-9_]*\\b(?!\\s*\\()" } ] },
     "operators": { "patterns": [ { "name": "keyword.operator.comparison.lyng", "match": "===|!==|==|!=|<=|>=|<|>" }, { "name": "keyword.operator.shuttle.lyng", "match": "<=>" }, { "name": "keyword.operator.arrow.lyng", "match": "=>|->|::" }, { "name": "keyword.operator.range.lyng", "match": "\\.\\.\\.|\\.\\.<|\\.\\." }, { "name": "keyword.operator.nullsafe.lyng", "match": "\\?\\.|\\?\\[|\\?\\(|\\?\\{|\\?:|\\?\\?" }, { "name": "keyword.operator.assignment.lyng", "match": "(?:\\+=|-=|\\*=|/=|%=|=)" }, { "name": "keyword.operator.logical.lyng", "match": "&&|\\|\\|" }, { "name": "keyword.operator.bitwise.lyng", "match": "<<|>>|&|\\||\\^|~" }, { "name": "keyword.operator.match.lyng", "match": "=~|!~" }, { "name": "keyword.operator.arithmetic.lyng", "match": "\\+\\+|--|[+\\-*/%]" }, { "name": "keyword.operator.other.lyng", "match": "[!?]" } ] },

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/editor/LyngEnterHandler.kt

@@ -85,13 +85,7 @@ class LyngEnterHandler : EnterHandlerDelegate {
             if (code == "}" || code == "*/") {
                 // Adjust indent for the previous line if it's a block or comment closer
                 val prevStart = doc.getLineStartOffset(prevLine)
-                if (file.context == null) {
+                CodeStyleManager.getInstance(project).adjustLineIndent(file, prevStart)
-                    try {
-                        CodeStyleManager.getInstance(project).adjustLineIndent(file, prevStart)
-                    } catch (e: Exception) {
-                        log.warn("Failed to adjust line indent for previous line: ${e.message}")
-                    }
-                }
 
                 // Fallback for previous line: manual application
                 val desiredPrev = computeDesiredIndent(project, doc, prevLine)
@@ -108,13 +102,8 @@ class LyngEnterHandler : EnterHandlerDelegate {
         }
         // Adjust indent for the current (new) line
         val currentStart = doc.getLineStartOffsetSafe(currentLine)
-        if (file.context == null) {
+        val csm = CodeStyleManager.getInstance(project)
-            try {
+        csm.adjustLineIndent(file, currentStart)
-                CodeStyleManager.getInstance(project).adjustLineIndent(file, currentStart)
-            } catch (e: Exception) {
-                log.warn("Failed to adjust line indent for current line: ${e.message}")
-            }
-        }
 
         // Fallback: if the platform didn't physically insert indentation, compute it from our formatter and apply
         val lineStart = doc.getLineStartOffset(currentLine)

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/editor/LyngTypedHandler.kt

@@ -58,13 +58,7 @@ class LyngTypedHandler : TypedHandlerDelegate() {
                 }
                 // After block reindent, adjust line indent to what platform thinks (no-op in many cases)
                 val lineStart = doc.getLineStartOffset(line)
-                if (file.context == null) {
+                CodeStyleManager.getInstance(project).adjustLineIndent(file, lineStart)
-                    try {
-                        CodeStyleManager.getInstance(project).adjustLineIndent(file, lineStart)
-                    } catch (e: Exception) {
-                        log.warn("Failed to adjust line indent for current line: ${e.message}")
-                    }
-                }
             }
         } else if (c == '/') {
             val doc = editor.document
@@ -73,13 +67,7 @@ class LyngTypedHandler : TypedHandlerDelegate() {
                 PsiDocumentManager.getInstance(project).commitDocument(doc)
                 val line = doc.getLineNumber(offset - 1)
                 val lineStart = doc.getLineStartOffset(line)
-                if (file.context == null) {
+                CodeStyleManager.getInstance(project).adjustLineIndent(file, lineStart)
-                    try {
-                        CodeStyleManager.getInstance(project).adjustLineIndent(file, lineStart)
-                    } catch (e: Exception) {
-                        log.warn("Failed to adjust line indent for comment: ${e.message}")
-                    }
-                }
 
                 // Manual application fallback
                 val desired = computeDesiredIndent(project, doc, line)

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/format/LyngFormattingModelBuilder.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -42,7 +42,7 @@ private class LineBlocksRootBlock(
     private val file: PsiFile,
     private val settings: CodeStyleSettings
 ) : Block {
-    override fun getTextRange(): TextRange = TextRange(0, file.textLength)
+    override fun getTextRange(): TextRange = file.textRange
 
     override fun getSubBlocks(): List<Block> = emptyList()
 
@@ -52,7 +52,7 @@ private class LineBlocksRootBlock(
     override fun getSpacing(child1: Block?, child2: Block): Spacing? = null
     override fun getChildAttributes(newChildIndex: Int): ChildAttributes = ChildAttributes(Indent.getNoneIndent(), null)
     override fun isIncomplete(): Boolean = false
-    override fun isLeaf(): Boolean = true
+    override fun isLeaf(): Boolean = false
 }
 
 // Intentionally no sub-blocks/spacing: indentation is handled by PreFormatProcessor + LineIndentProvider

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/format/LyngPreFormatProcessor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -44,67 +44,25 @@ class LyngPreFormatProcessor : PreFormatProcessor {
         // When both spacing and wrapping are OFF, still fix indentation for the whole file to
         // guarantee visible changes on Reformat Code.
         val runFullFileIndent = !settings.enableSpacing && !settings.enableWrapping
+        // Maintain a working range and a modification flag to avoid stale offsets after replacements
         var modified = false
+        fun fullRange(): TextRange = TextRange(0, doc.textLength)
+        var workingRange: TextRange = range.intersection(fullRange()) ?: fullRange()
 
-        val docW = doc as? com.intellij.injected.editor.DocumentWindow
+        val startLine = if (runFullFileIndent) 0 else doc.getLineNumber(workingRange.startOffset)
-        // The host range of the entire injected fragment (or the whole file if not injected).
+        val endLine = if (runFullFileIndent) (doc.lineCount - 1).coerceAtLeast(0)
-        fun currentHostRange(): TextRange = if (docW != null) {
+        else doc.getLineNumber(workingRange.endOffset.coerceAtMost(doc.textLength))
-            TextRange(docW.injectedToHost(0), docW.injectedToHost(doc.textLength))
-        } else {
-            file.textRange
-        }
-
-        // The range in 'doc' coordinate system (local 0..len for injections, host offsets for normal files).
-        fun currentLocalRange(): TextRange = if (docW != null) {
-            TextRange(0, doc.textLength)
-        } else {
-            file.textRange
-        }
-
-        val clr = currentLocalRange()
-        val chr = currentHostRange()
-
-        // Convert the input range to the coordinate system of 'doc'
-        var workingRangeLocal: TextRange = if (docW != null) {
-            val hostIntersection = range.intersection(chr)
-            if (hostIntersection != null) {
-                try {
-                    val start = docW.hostToInjected(hostIntersection.startOffset)
-                    val end = docW.hostToInjected(hostIntersection.endOffset)
-                    TextRange(start.coerceAtMost(end), end.coerceAtLeast(start))
-                } catch (e: Exception) {
-                    clr
-                }
-            } else {
-                range.intersection(clr) ?: clr
-            }
-        } else {
-            range.intersection(clr) ?: clr
-        }
-
-        val startLine = if (runFullFileIndent) {
-            doc.getLineNumber(currentLocalRange().startOffset)
-        } else {
-            doc.getLineNumber(workingRangeLocal.startOffset)
-        }
-        val endLine = if (runFullFileIndent) {
-            if (clr.endOffset <= clr.startOffset) doc.getLineNumber(clr.startOffset)
-            else doc.getLineNumber(clr.endOffset)
-        } else {
-            doc.getLineNumber(workingRangeLocal.endOffset.coerceAtMost(doc.textLength))
-        }
 
         fun codePart(s: String): String {
             val idx = s.indexOf("//")
             return if (idx >= 0) s.substring(0, idx) else s
         }
 
-        // Pre-scan to compute balances up to startLine.
+        // Pre-scan to compute balances up to startLine
-        val fragmentStartLine = doc.getLineNumber(currentLocalRange().startOffset)
         var blockLevel = 0
         var parenBalance = 0
         var bracketBalance = 0
-        for (ln in fragmentStartLine until startLine) {
+        for (ln in 0 until startLine) {
             val text = doc.getText(TextRange(doc.getLineStartOffset(ln), doc.getLineEndOffset(ln)))
             for (ch in codePart(text)) when (ch) {
                 '{' -> blockLevel++
@@ -122,13 +80,7 @@ class LyngPreFormatProcessor : PreFormatProcessor {
             val lineStart = doc.getLineStartOffset(line)
             // adjustLineIndent delegates to our LineIndentProvider which computes
             // indentation from scratch; this is safe and idempotent
-            if (file.context == null) {
+            CodeStyleManager.getInstance(project).adjustLineIndent(file, lineStart)
-                try {
-                    CodeStyleManager.getInstance(project).adjustLineIndent(file, lineStart)
-                } catch (e: Exception) {
-                    // Log as debug because this can be called many times during reformat
-                }
-            }
 
             // After indentation, update block/paren/bracket balances using the current line text
             val lineEnd = doc.getLineEndOffset(line)
@@ -151,14 +103,15 @@ class LyngPreFormatProcessor : PreFormatProcessor {
                 useTabs = options.USE_TAB_CHARACTER,
                 continuationIndentSize = options.CONTINUATION_INDENT_SIZE.coerceAtLeast(options.INDENT_SIZE.coerceAtLeast(1)),
             )
-            val r = if (runFullFileIndent) currentLocalRange() else workingRangeLocal.intersection(currentLocalRange()) ?: currentLocalRange()
+            val full = fullRange()
+            val r = if (runFullFileIndent) full else workingRange.intersection(full) ?: full
             val text = doc.getText(r)
             val formatted = LyngFormatter.reindent(text, cfg)
             if (formatted != text) {
                 doc.replaceString(r.startOffset, r.endOffset, formatted)
                 modified = true
                 psiDoc.commitDocument(doc)
-                workingRangeLocal = currentLocalRange()
+                workingRange = fullRange()
             }
         }
 
@@ -171,14 +124,14 @@ class LyngPreFormatProcessor : PreFormatProcessor {
                 applySpacing = true,
                 applyWrapping = false,
             )
-            val r = if (runFullFileIndent) currentLocalRange() else workingRangeLocal.intersection(currentLocalRange()) ?: currentLocalRange()
+            val safe = workingRange.intersection(fullRange()) ?: fullRange()
-            val text = doc.getText(r)
+            val text = doc.getText(safe)
             val formatted = LyngFormatter.format(text, cfg)
             if (formatted != text) {
-                doc.replaceString(r.startOffset, r.endOffset, formatted)
+                doc.replaceString(safe.startOffset, safe.endOffset, formatted)
                 modified = true
                 psiDoc.commitDocument(doc)
-                workingRangeLocal = currentLocalRange()
+                workingRange = fullRange()
             }
         }
         // Optionally apply wrapping (after spacing) when enabled
@@ -190,19 +143,17 @@ class LyngPreFormatProcessor : PreFormatProcessor {
                 applySpacing = settings.enableSpacing,
                 applyWrapping = true,
             )
-            val r = if (runFullFileIndent) currentLocalRange() else workingRangeLocal.intersection(currentLocalRange()) ?: currentLocalRange()
+            val safe2 = workingRange.intersection(fullRange()) ?: fullRange()
-            val text = doc.getText(r)
+            val text2 = doc.getText(safe2)
-            val wrapped = LyngFormatter.format(text, cfg)
+            val wrapped = LyngFormatter.format(text2, cfg)
-            if (wrapped != text) {
+            if (wrapped != text2) {
-                doc.replaceString(r.startOffset, r.endOffset, wrapped)
+                doc.replaceString(safe2.startOffset, safe2.endOffset, wrapped)
                 modified = true
                 psiDoc.commitDocument(doc)
-                workingRangeLocal = currentLocalRange()
+                workingRange = fullRange()
             }
         }
-        // Return a safe range for the formatter to continue with, preventing stale offsets.
+        // Return a safe range for the formatter to continue with, preventing stale offsets
-        // For injected files, ALWAYS return a range in local coordinates.
+        return if (modified) fullRange() else (range.intersection(fullRange()) ?: fullRange())
-        val finalRange = currentLocalRange()
-        return if (modified) finalRange else (range.intersection(finalRange) ?: finalRange)
     }
 }

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/grazie/LyngGrazieAnnotator.kt

@@ -579,8 +579,7 @@ class LyngGrazieAnnotator : ExternalAnnotator<LyngGrazieAnnotator.Input, LyngGra
         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",
+            "val","var","fun","class","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"
         )

lyng-idea/src/main/kotlin/net/sergeych/lyng/idea/highlight/LyngLexer.kt

@@ -32,8 +32,7 @@ class LyngLexer : LexerBase() {
     private var myTokenType: IElementType? = null
 
     private val keywords = setOf(
-        "fun", "val", "var", "class", "interface", "type", "import", "as",
+        "fun", "val", "var", "class", "type", "import", "as",
-        "abstract", "closed", "override",
         "if", "else", "for", "while", "return", "true", "false", "null",
         "when", "in", "is", "break", "continue", "try", "catch", "finally",
         "get", "set"

lynglib/build.gradle.kts

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.

lynglib/src/commonMain/kotlin/net/sergeych/lyng/ArgsDeclaration.kt

@@ -138,7 +138,7 @@ data class ArgsDeclaration(val params: List<Item>, val endTokenType: Token.Type)
                 } else {
                     val value = if (hp < callArgs.size) callArgs[hp++]
                     else a.defaultValue?.execute(scope)
-                        ?: scope.raiseIllegalArgument("too few arguments for the call (missing ${a.name})")
+                        ?: scope.raiseIllegalArgument("too few arguments for the call (${arguments.list})")
                     assign(a, value)
                 }
                 i++

lynglib/src/commonMain/kotlin/net/sergeych/lyng/ClosureScope.kt

@@ -53,71 +53,26 @@ class ClosureScope(val callScope: Scope, val closureScope: Scope) :
         super.objects[name]?.let { return it }
         super.localBindings[name]?.let { return it }
 
-        // 1a) Priority: if we are in a class context, prefer our own private members to support 
-        // non-virtual private dispatch. This prevents a subclass from accidentally 
-        // capturing a private member call from a base class.
-        // We only return non-field/non-property members (methods) here; fields must
-        // be resolved via instance storage in priority 2.
-        currentClassCtx?.let { ctx ->
-            ctx.members[name]?.let { rec ->
-                if (rec.visibility == Visibility.Private && 
-                    rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Field && 
-                    rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property) return rec
-            }
-        }
-
         // 2) Members on the captured receiver instance
-        (closureScope.thisObj as? net.sergeych.lyng.obj.ObjInstance)?.let { inst ->
+        (closureScope.thisObj as? net.sergeych.lyng.obj.ObjInstance)
-            // Check direct locals in instance scope (unmangled)
+            ?.instanceScope
-            inst.instanceScope.objects[name]?.let { rec ->
+            ?.objects
-                if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property && 
+            ?.get(name)
-                    canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
+            ?.let { rec ->
+                if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
             }
-            // Check mangled names for fields along MRO
-            for (cls in inst.objClass.mro) {
-                inst.instanceScope.objects["${cls.className}::$name"]?.let { rec ->
-                    if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property && 
-                        canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) return rec
-                }
-            }
-        }
-
         findExtension(closureScope.thisObj.objClass, name)?.let { return it }
         closureScope.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
-            if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
+            if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
-                // Return only non-field/non-property members (methods) from class-level records.
-                // Fields and properties must be resolved via instance storage (mangled) or readField.
-                if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Field && 
-                    rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property && 
-                    !rec.isAbstract) return rec
-            }
         }
 
         // 3) Closure scope chain (locals/parents + members), ignore ClosureScope overrides to prevent recursion
         closureScope.chainLookupWithMembers(name, currentClassCtx)?.let { return it }
 
         // 4) Caller `this` members
-        (callScope.thisObj as? net.sergeych.lyng.obj.ObjInstance)?.let { inst ->
-            // Check direct locals in instance scope (unmangled)
-            inst.instanceScope.objects[name]?.let { rec ->
-                if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property && 
-                    canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
-            }
-            // Check mangled names for fields along MRO
-            for (cls in inst.objClass.mro) {
-                inst.instanceScope.objects["${cls.className}::$name"]?.let { rec ->
-                    if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property && 
-                        canAccessMember(rec.visibility, rec.declaringClass ?: cls, currentClassCtx)) return rec
-                }
-            }
-        }
         findExtension(callScope.thisObj.objClass, name)?.let { return it }
         callScope.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
-            if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
+            if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) return rec
-                if (rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Field && 
-                    rec.type != net.sergeych.lyng.obj.ObjRecord.Type.Property && 
-                    !rec.isAbstract) return rec
-            }
         }
 
         // 5) Caller chain (locals/parents + members)

lynglib/src/commonMain/kotlin/net/sergeych/lyng/CodeContext.kt

@@ -20,7 +20,5 @@ package net.sergeych.lyng
 sealed class CodeContext {
     class Module(@Suppress("unused") val packageName: String?): CodeContext()
     class Function(val name: String): CodeContext()
-    class ClassBody(val name: String): CodeContext() {
+    class ClassBody(val name: String): CodeContext()
-        val pendingInitializations = mutableMapOf<String, Pos>()
-    }
 }

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Parser.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -324,14 +324,15 @@ private class Parser(fromPos: Pos) {
             }
 
             '?' -> {
-                when (currentChar) {
+                when (currentChar.also { pos.advance() }) {
-                    ':' -> { pos.advance(); Token("?:", from, Token.Type.ELVIS) }
+                    ':' -> Token("??", from, Token.Type.ELVIS)
-                    '?' -> { pos.advance(); Token("??", from, Token.Type.ELVIS) }
+                    '?' -> Token("??", from, Token.Type.ELVIS)
-                    '.' -> { pos.advance(); Token("?.", from, Token.Type.NULL_COALESCE) }
+                    '.' -> Token("?.", from, Token.Type.NULL_COALESCE)
-                    '[' -> { pos.advance(); Token("?[", from, Token.Type.NULL_COALESCE_INDEX) }
+                    '[' -> Token("?(", from, Token.Type.NULL_COALESCE_INDEX)
-                    '(' -> { pos.advance(); Token("?(", from, Token.Type.NULL_COALESCE_INVOKE) }
+                    '(' -> Token("?(", from, Token.Type.NULL_COALESCE_INVOKE)
-                    '{' -> { pos.advance(); Token("?{", from, Token.Type.NULL_COALESCE_BLOCKINVOKE) }
+                    '{' -> Token("?{", from, Token.Type.NULL_COALESCE_BLOCKINVOKE)
                     else -> {
+                        pos.back()
                         Token("?", from, Token.Type.QUESTION)
                     }
                 }
@@ -356,8 +357,6 @@ private class Parser(fromPos: Pos) {
                         when (text) {
                             "in" -> Token("in", from, Token.Type.IN)
                             "is" -> Token("is", from, Token.Type.IS)
-                            "by" -> Token("by", from, Token.Type.BY)
-                            "object" -> Token("object", from, Token.Type.OBJECT)
                             "as" -> {
                                 // support both `as` and tight `as?` without spaces
                                 if (currentChar == '?') { pos.advance(); Token("as?", from, Token.Type.ASNULL) }

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Scope.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -155,10 +155,7 @@ open class Scope(
             this.extensions[cls]?.get(name)?.let { return it }
         }
         return thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
-            if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
+            if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) rec else null
-                if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
-                else rec
-            } else null
         }
     }
 
@@ -179,11 +176,7 @@ open class Scope(
                 s.extensions[cls]?.get(name)?.let { return it }
             }
             s.thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
-                if (canAccessMember(rec.visibility, rec.declaringClass, caller)) {
+                if (canAccessMember(rec.visibility, rec.declaringClass, caller)) return rec
-                    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
-                    } else return rec
-                }
             }
             s = s.parent
         }
@@ -269,9 +262,6 @@ open class Scope(
 
     fun raiseClassCastError(msg: String): Nothing = raiseError(ObjClassCastException(this, msg))
 
-    fun raiseUnset(message: String = "property is unset (not initialized)"): Nothing =
-        raiseError(ObjUnsetException(this, message))
-
     @Suppress("unused")
     fun raiseSymbolNotFound(name: String): Nothing =
         raiseError(ObjSymbolNotDefinedException(this, "symbol is not defined: $name"))
@@ -339,10 +329,7 @@ open class Scope(
                 ?: parent?.get(name)
                 // Finally, fallback to class members on thisObj
                 ?: thisObj.objClass.getInstanceMemberOrNull(name)?.let { rec ->
-                    if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) {
+                    if (canAccessMember(rec.visibility, rec.declaringClass, currentClassCtx)) rec else null
-                        if (rec.type == ObjRecord.Type.Field || rec.type == ObjRecord.Type.Property || rec.isAbstract) null
-                        else rec
-                    } else null
                 }
                 )
         }
@@ -444,11 +431,7 @@ open class Scope(
         name: String,
         value: Obj,
         visibility: Visibility = Visibility.Public,
-        writeVisibility: Visibility? = null,
+        recordType: ObjRecord.Type = ObjRecord.Type.Other
-        recordType: ObjRecord.Type = ObjRecord.Type.Other,
-        isAbstract: Boolean = false,
-        isClosed: Boolean = false,
-        isOverride: Boolean = false
     ): ObjRecord =
         objects[name]?.let {
             if( !it.isMutable )
@@ -462,28 +445,17 @@ open class Scope(
                 callScope.localBindings[name] = it
             }
             it
-        } ?: addItem(name, true, value, visibility, writeVisibility, recordType, isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride)
+        } ?: addItem(name, true, value, visibility, recordType)
 
     fun addItem(
         name: String,
         isMutable: Boolean,
         value: Obj,
         visibility: Visibility = Visibility.Public,
-        writeVisibility: Visibility? = null,
         recordType: ObjRecord.Type = ObjRecord.Type.Other,
-        declaringClass: net.sergeych.lyng.obj.ObjClass? = currentClassCtx,
+        declaringClass: net.sergeych.lyng.obj.ObjClass? = currentClassCtx
-        isAbstract: Boolean = false,
-        isClosed: Boolean = false,
-        isOverride: Boolean = false
     ): ObjRecord {
-        val rec = ObjRecord(
+        val rec = ObjRecord(value, isMutable, visibility, declaringClass = declaringClass, type = recordType)
-            value, isMutable, visibility, writeVisibility,
-            declaringClass = declaringClass,
-            type = recordType,
-            isAbstract = isAbstract,
-            isClosed = isClosed,
-            isOverride = isOverride
-        )
         objects[name] = rec
         // Index this binding within the current frame to help resolve locals across suspension
         localBindings[name] = rec
@@ -621,36 +593,6 @@ open class Scope(
         return ref.evalValue(this)
     }
 
-    suspend fun resolve(rec: ObjRecord, name: String): Obj {
-        if (rec.type == ObjRecord.Type.Delegated) {
-            val del = rec.delegate ?: raiseError("Internal error: delegated property $name has no delegate")
-            val th = if (thisObj === ObjVoid) ObjNull else thisObj
-            if (del.objClass.getInstanceMemberOrNull("getValue") == null) {
-                return object : Statement() {
-                    override val pos: Pos = Pos.builtIn
-                    override suspend fun execute(scope: Scope): Obj {
-                        val th2 = if (scope.thisObj === ObjVoid) ObjNull else scope.thisObj
-                        val allArgs = (listOf(th2, ObjString(name)) + scope.args.list).toTypedArray()
-                        return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs))
-                    }
-                }
-            }
-            return del.invokeInstanceMethod(this, "getValue", Arguments(th, ObjString(name)))
-        }
-        return rec.value
-    }
-
-    suspend fun assign(rec: ObjRecord, name: String, newValue: Obj) {
-        if (rec.type == ObjRecord.Type.Delegated) {
-            val del = rec.delegate ?: raiseError("Internal error: delegated property $name has no delegate")
-            val th = if (thisObj === ObjVoid) ObjNull else thisObj
-            del.invokeInstanceMethod(this, "setValue", Arguments(th, ObjString(name), newValue))
-            return
-        }
-        if (!rec.isMutable && rec.value !== ObjUnset) raiseIllegalAssignment("can't reassign val $name")
-        rec.value = newValue
-    }
-
     companion object {
 
         fun new(): Scope =

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Script.kt

@@ -21,7 +21,6 @@ import kotlinx.coroutines.delay
 import kotlinx.coroutines.yield
 import net.sergeych.lyng.Script.Companion.defaultImportManager
 import net.sergeych.lyng.miniast.addConstDoc
-import net.sergeych.lyng.miniast.addFnDoc
 import net.sergeych.lyng.miniast.addVoidFnDoc
 import net.sergeych.lyng.miniast.type
 import net.sergeych.lyng.obj.*
@@ -61,7 +60,6 @@ class Script(
 
         internal val rootScope: Scope = Scope(null).apply {
             ObjException.addExceptionsToContext(this)
-            addConst("Unset", ObjUnset)
             addFn("print") {
                 for ((i, a) in args.withIndex()) {
                     if (i > 0) print(' ' + a.toString(this).value)
@@ -205,32 +203,18 @@ class Script(
                         )
                     )
             }
-            addFnDoc(
+            addFn("assertThrows") {
-                "assertThrows",
-                doc = """
-                    Asserts that the provided code block throws an exception, with or without exception: 
-                    ```lyng
-                        assertThrows { /* ode */ }
-                        assertThrows(IllegalArgumentException) { /* code */ }
-                    ```
-                    If an expected exception class is provided,
-                    it checks that the thrown exception is of that class. If no expected class is provided, any exception
-                    will be accepted.
-                """.trimIndent()
-            ) {
                 val code: Statement
                 val expectedClass: ObjClass?
-                when (args.size) {
+                when(args.size) {
                     1 -> {
                         code = requiredArg<Statement>(0)
                         expectedClass = null
                     }
-
                     2 -> {
                         code = requiredArg<Statement>(1)
                         expectedClass = requiredArg<ObjClass>(0)
                     }
-
                     else -> raiseIllegalArgument("Expected 1 or 2 arguments, got ${args.size}")
                 }
                 val result = try {
@@ -241,15 +225,10 @@ class Script(
                 } catch (_: ScriptError) {
                     ObjNull
                 }
-                if (result == null) raiseError(
+                if( result == null ) raiseError(ObjAssertionFailedException(this, "Expected exception but nothing was thrown"))
-                    ObjAssertionFailedException(
-                        this,
-                        "Expected exception but nothing was thrown"
-                    )
-                )
                 expectedClass?.let {
-                    if (result !is ObjException)
+                    if( result !is ObjException)
-                        raiseError("Expected $expectedClass, got non-lyng exception $result")
+                        raiseError("Expected $expectedClass, got $result")
                     if (result.exceptionClass != expectedClass) {
                         raiseError("Expected $expectedClass, got ${result.exceptionClass}")
                     }
@@ -275,7 +254,7 @@ class Script(
                 val condition = requiredArg<ObjBool>(0)
                 if (!condition.value) {
                     var message = args.list.getOrNull(1)
-                    if (message is Statement) message = message.execute(this)
+                    if( message is Statement ) message = message.execute(this)
                     raiseIllegalArgument(message?.toString() ?: "requirement not met")
                 }
                 ObjVoid
@@ -284,7 +263,7 @@ class Script(
                 val condition = requiredArg<ObjBool>(0)
                 if (!condition.value) {
                     var message = args.list.getOrNull(1)
-                    if (message is Statement) message = message.execute(this)
+                    if( message is Statement ) message = message.execute(this)
                     raiseIllegalState(message?.toString() ?: "check failed")
                 }
                 ObjVoid

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Token.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -36,7 +36,7 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
         PLUS, MINUS, STAR, SLASH, PERCENT,
         ASSIGN, PLUSASSIGN, MINUSASSIGN, STARASSIGN, SLASHASSIGN, PERCENTASSIGN,
         PLUS2, MINUS2,
-        IN, NOTIN, IS, NOTIS, BY,
+        IN, NOTIN, IS, NOTIS,
         EQ, NEQ, LT, LTE, GT, GTE, REF_EQ, REF_NEQ, MATCH, NOTMATCH,
         SHUTTLE,
         AND, BITAND, OR, BITOR, BITXOR, NOT, BITNOT, DOT, ARROW, EQARROW, QUESTION, COLONCOLON,
@@ -44,7 +44,7 @@ data class Token(val value: String, val pos: Pos, val type: Type) {
         SINLGE_LINE_COMMENT, MULTILINE_COMMENT,
         LABEL, ATLABEL, // label@ at@label
         // type-checking/casting
-        AS, ASNULL, OBJECT,
+        AS, ASNULL,
         //PUBLIC, PROTECTED, INTERNAL, EXPORT, OPEN, INLINE, OVERRIDE, ABSTRACT, SEALED, EXTERNAL, VAL, VAR, CONST, TYPE, FUN, CLASS, INTERFACE, ENUM, OBJECT, TRAIT, THIS,
         ELLIPSIS, DOTDOT, DOTDOTLT,
         NEWLINE,

lynglib/src/commonMain/kotlin/net/sergeych/lyng/Visibility.kt

@@ -18,7 +18,7 @@
 package net.sergeych.lyng
 
 enum class Visibility {
-    Public, Protected, Private;//, Internal
+    Public, Private, Protected;//, Internal
     val isPublic by lazy { this == Public }
     @Suppress("unused")
     val isProtected by lazy { this == Protected }

lynglib/src/commonMain/kotlin/net/sergeych/lyng/binding/Binder.kt

@@ -113,15 +113,6 @@ object Binder {
                 symbols += fieldSym
                 classes.last().fields += fieldSym.id
             }
-            // Class fields (val/var in class body, if any are reported here)
-            for (cf in d.classFields) {
-                val fs = source.offsetOf(cf.nameStart)
-                val fe = fs + cf.name.length
-                val kind = if (cf.mutable) SymbolKind.Variable else SymbolKind.Value
-                val fieldSym = Symbol(nextId++, cf.name, kind, fs, fe, containerId = sym.id)
-                symbols += fieldSym
-                classes.last().fields += fieldSym.id
-            }
         }
 
         // Second pass: functions and top-level/class vals/vars

lynglib/src/commonMain/kotlin/net/sergeych/lyng/format/LyngFormatter.kt

@@ -24,24 +24,6 @@ package net.sergeych.lyng.format
  */
 object LyngFormatter {
 
-    private fun startsWithWord(s: String, w: String): Boolean =
-        s.startsWith(w) && s.getOrNull(w.length)?.let { !it.isLetterOrDigit() && it != '_' } != false
-
-    private fun isPropertyAccessor(s: String): Boolean {
-        val t = s.trim()
-        if (t.isEmpty()) return false
-        if (startsWithWord(t, "get") || startsWithWord(t, "set")) return true
-        if (startsWithWord(t, "private")) {
-            val rest = t.substring("private".length).trimStart()
-            if (startsWithWord(rest, "set")) return true
-        }
-        if (startsWithWord(t, "protected")) {
-            val rest = t.substring("protected".length).trimStart()
-            if (startsWithWord(rest, "set")) return true
-        }
-        return false
-    }
-
     /** Returns the input with indentation recomputed from scratch, line by line. */
     fun reindent(text: String, config: LyngFormatConfig = LyngFormatConfig()): String {
         // Normalize tabs to spaces globally before any transformation; results must contain no tabs
@@ -53,7 +35,6 @@ object LyngFormatter {
         var bracketBalance = 0
         var prevBracketContinuation = false
         var inBlockComment = false
-        val extraIndents = mutableListOf<Int>()
         // We don't keep per-"[" base alignment; continuation rules define alignment.
 
         fun updateBalances(ch: Char) {
@@ -71,7 +52,7 @@ object LyngFormatter {
             // Always produce spaces; tabs are not allowed in resulting code
             " ".repeat(level * config.indentSize + continuation)
 
-        var awaitingExtraIndent = 0
+        var awaitingSingleIndent = false
         fun isControlHeaderNoBrace(s: String): Boolean {
             val t = s.trim()
             if (t.isEmpty()) return false
@@ -79,13 +60,7 @@ object LyngFormatter {
             val isIf = Regex("^if\\s*\\(.*\\)\\s*$").matches(t)
             val isElseIf = Regex("^else\\s+if\\s*\\(.*\\)\\s*$").matches(t)
             val isElse = t == "else"
-            if (isIf || isElseIf || isElse) return true
+            return isIf || isElseIf || isElse
-
-            // property accessors ending with ) or =
-            if (isPropertyAccessor(t)) {
-                return if (t.contains('=')) t.endsWith('=') else t.endsWith(')')
-            }
-            return false
         }
 
         for ((i, rawLine) in lines.withIndex()) {
@@ -95,12 +70,7 @@ object LyngFormatter {
             val trimmedLine = rawLine.trim()
 
             // Compute effective indent level for this line
-            val currentExtraIndent = extraIndents.sum()
+            var effectiveLevel = blockLevel
-            var effectiveLevel = blockLevel + currentExtraIndent
-
-            val isAccessor = !inBlockComment && isPropertyAccessor(trimmedStart)
-            if (isAccessor) effectiveLevel += 1
-
             if (inBlockComment) {
                 if (!trimmedLine.startsWith("*/")) {
                     effectiveLevel += 1
@@ -113,9 +83,9 @@ object LyngFormatter {
 
             // Single-line control header (if/else/else if) without braces: indent the next
             // non-empty, non-'}', non-'else' line by one extra level
-            val applyAwaiting = awaitingExtraIndent > 0 && trimmedStart.isNotEmpty() &&
+            val applyAwaiting = awaitingSingleIndent && trimmedStart.isNotEmpty() &&
                     !trimmedStart.startsWith("else") && !trimmedStart.startsWith("}")
-            if (applyAwaiting) effectiveLevel += awaitingExtraIndent
+            if (applyAwaiting) effectiveLevel += 1
 
             val firstChar = trimmedStart.firstOrNull()
             // While inside parentheses, continuation applies scaled by nesting level
@@ -159,43 +129,23 @@ object LyngFormatter {
             // New line (keep EOF semantics similar to input)
             if (i < lines.lastIndex) sb.append('\n')
 
-            val oldBlockLevel = blockLevel
             // Update balances using this line's code content
             for (part in parts) {
                 if (part.type == PartType.Code) {
                     for (ch in part.text) updateBalances(ch)
                 }
             }
-            val newBlockLevel = blockLevel
-            if (newBlockLevel > oldBlockLevel) {
-                val addedThisLine = (if (applyAwaiting) awaitingExtraIndent else 0) + (if (isAccessor) 1 else 0)
-                repeat(newBlockLevel - oldBlockLevel) {
-                    extraIndents.add(addedThisLine)
-                }
-            } else if (newBlockLevel < oldBlockLevel) {
-                repeat(oldBlockLevel - newBlockLevel) {
-                    if (extraIndents.isNotEmpty()) extraIndents.removeAt(extraIndents.size - 1)
-                }
-            }
-
             inBlockComment = nextInBlockComment
 
-            // Update awaitingExtraIndent based on current line
+            // Update awaitingSingleIndent based on current line
             if (applyAwaiting && trimmedStart.isNotEmpty()) {
-                // we have just applied it.
+                // we have just consumed the body line
-                val endsWithBrace = code.trimEnd().endsWith("{")
+                awaitingSingleIndent = false
-                if (!endsWithBrace && isControlHeaderNoBrace(code)) {
-                    // It's another header, increment
-                    awaitingExtraIndent += if (isAccessor) 2 else 1
-                } else {
-                    // It's the body, reset
-                    awaitingExtraIndent = 0
-                }
             } else {
                 // start awaiting if current line is a control header without '{'
                 val endsWithBrace = code.trimEnd().endsWith("{")
                 if (!endsWithBrace && isControlHeaderNoBrace(code)) {
-                    awaitingExtraIndent = if (isAccessor) 2 else 1
+                    awaitingSingleIndent = true
                 }
             }
 
@@ -246,6 +196,9 @@ object LyngFormatter {
         return applyControlledWrapping(spacedText, config)
     }
 
+    private fun startsWithWord(s: String, w: String): Boolean =
+        s.startsWith(w) && s.getOrNull(w.length)?.let { !it.isLetterOrDigit() && it != '_' } != false
+
     /**
      * Reindents a slice of [text] specified by [range] and returns a new string with that slice replaced.
      * By default, preserves the base indent of the first line in the slice (so the block stays at
@@ -288,20 +241,7 @@ object LyngFormatter {
                 i++
             }
             // Normalize collected base indent: replace tabs with spaces
-            var baseIndent = if (onlyWs) {
+            var baseIndent = if (onlyWs) base.toString().replace("\t", " ".repeat(config.indentSize)) else ""
-                if (start == lineStart) {
-                    // Range starts at line start, pick up this line's indentation as base
-                    var k = start
-                    val lineIndent = StringBuilder()
-                    while (k < text.length && text[k] != '\n' && (text[k] == ' ' || text[k] == '\t')) {
-                        lineIndent.append(text[k])
-                        k++
-                    }
-                    lineIndent.toString().replace("\t", " ".repeat(config.indentSize))
-                } else {
-                    base.toString().replace("\t", " ".repeat(config.indentSize))
-                }
-            } else ""
             var parentBaseIndent: String? = baseIndent
             if (baseIndent.isEmpty()) {
                 // Fallback: use the indent of the nearest previous non-empty line as base.

lynglib/src/commonMain/kotlin/net/sergeych/lyng/highlight/SimpleLyngHighlighter.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -41,12 +41,11 @@ private val fallbackKeywordIds = setOf(
     // boolean operators
     "and", "or", "not",
     // declarations & modifiers
-    "fun", "fn", "class", "interface", "enum", "val", "var", "import", "package",
+    "fun", "fn", "class", "enum", "val", "var", "import", "package",
-    "abstract", "closed", "override",
+    "private", "protected", "static", "open", "extern",
-    "private", "protected", "static", "open", "extern", "init", "get", "set", "by",
     // control flow and misc
     "if", "else", "when", "while", "do", "for", "try", "catch", "finally",
-    "throw", "return", "break", "continue", "this", "null", "true", "false", "unset"
+    "throw", "return", "break", "continue", "this", "null", "true", "false"
 )
 
 /** Maps lexer token type (and sometimes value) to a [HighlightKind]. */
@@ -74,7 +73,7 @@ private fun kindOf(type: Type, value: String): HighlightKind? = when (type) {
     Type.COMMA, Type.SEMICOLON, Type.COLON -> HighlightKind.Punctuation
 
     // textual control keywords
-    Type.IN, Type.NOTIN, Type.IS, Type.NOTIS, Type.AS, Type.ASNULL, Type.BY, Type.OBJECT,
+    Type.IN, Type.NOTIN, Type.IS, Type.NOTIS, Type.AS, Type.ASNULL,
     Type.AND, Type.OR, Type.NOT -> HighlightKind.Keyword
 
     // labels / annotations

lynglib/src/commonMain/kotlin/net/sergeych/lyng/miniast/BuiltinDocRegistry.kt

@@ -112,8 +112,8 @@ object BuiltinDocRegistry : BuiltinDocSource {
     fun extensionMemberNamesFor(className: String): List<String> {
         val src = try { rootLyng } catch (_: Throwable) { null } ?: return emptyList()
         val out = LinkedHashSet<String>()
-        // Match lines like: fun String.trim(...) or val Int.isEven = ... (allowing modifiers)
+        // Match lines like: fun String.trim(...) or val Int.isEven = ...
-        val re = Regex("^\\s*(?:(?:abstract|override|closed|private|protected|static|open|extern)\\s+)*(?:fun|val|var)\\s+${className}\\.([A-Za-z_][A-Za-z0-9_]*)\\b", RegexOption.MULTILINE)
+        val re = Regex("^\\s*(?:fun|val|var)\\s+${className}\\.([A-Za-z_][A-Za-z0-9_]*)\\b", RegexOption.MULTILINE)
         re.findAll(src).forEach { m ->
             val name = m.groupValues.getOrNull(1)?.trim()
             if (!name.isNullOrEmpty()) out.add(name)
@@ -371,20 +371,20 @@ private object StdlibInlineDocIndex {
                 else -> {
                     // Non-comment, non-blank: try to match a declaration just after comments
                     if (buf.isNotEmpty()) {
-                        // fun/val/var Class.name( ... ) (allowing modifiers)
+                        // fun/val/var Class.name( ... )
-                        val mExt = Regex("^(?:(?:abstract|override|closed|private|protected|static|open|extern)\\s+)*(?:fun|val|var)\\s+([A-Za-z_][A-Za-z0-9_]*)\\.([A-Za-z_][A-Za-z0-9_]*)\\b").find(line)
+                        val mExt = Regex("^(?:fun|val|var)\\s+([A-Za-z_][A-Za-z0-9_]*)\\.([A-Za-z_][A-Za-z0-9_]*)\\b").find(line)
                         if (mExt != null) {
                             val (cls, name) = mExt.destructured
                             flushTo(Key.Method(cls, name))
                         } else {
-                            // fun name( ... ) (allowing modifiers)
+                            // fun name( ... )
-                            val mTop = Regex("^(?:(?:abstract|override|closed|private|protected|static|open|extern)\\s+)*fun\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*\\(").find(line)
+                            val mTop = Regex("^fun\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*\\(").find(line)
                             if (mTop != null) {
                                 val (name) = mTop.destructured
                                 flushTo(Key.TopFun(name))
                             } else {
-                                // class/interface Name (allowing modifiers)
+                                // class Name
-                                val mClass = Regex("^(?:(?:abstract|private|protected|static|open|extern)\\s+)*(?:class|interface)\\s+([A-Za-z_][A-Za-z0-9_]*)\\b").find(line)
+                                val mClass = Regex("^class\\s+([A-Za-z_][A-Za-z0-9_]*)\\b").find(line)
                                 if (mClass != null) {
                                     val (name) = mClass.destructured
                                     flushTo(Key.Clazz(name))

lynglib/src/commonMain/kotlin/net/sergeych/lyng/miniast/DocLookupUtils.kt

@@ -435,16 +435,16 @@ object DocLookupUtils {
         if (start !in 0..end) return emptyMap()
         val body = text.substring(start, end)
         val map = LinkedHashMap<String, ScannedSig>()
-        // fun name(params): Type (allowing modifiers like abstract, override, closed)
+        // fun name(params): Type
-        val funRe = Regex("^\\s*(?:(?:abstract|override|closed|private|protected|static|open|extern)\\s+)*fun\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*\\(([^)]*)\\)\\s*(?::\\s*([A-Za-z_][A-Za-z0-9_]*))?", RegexOption.MULTILINE)
+        val funRe = Regex("^\\s*fun\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*\\(([^)]*)\\)\\s*(?::\\s*([A-Za-z_][A-Za-z0-9_]*))?", RegexOption.MULTILINE)
         for (m in funRe.findAll(body)) {
             val name = m.groupValues.getOrNull(1) ?: continue
             val params = m.groupValues.getOrNull(2)?.split(',')?.mapNotNull { it.trim().takeIf { it.isNotEmpty() } } ?: emptyList()
             val type = m.groupValues.getOrNull(3)?.takeIf { it.isNotBlank() }
             map[name] = ScannedSig("fun", params, type)
         }
-        // val/var name: Type (allowing modifiers)
+        // val/var name: Type
-        val valRe = Regex("^\\s*(?:(?:abstract|override|closed|private|protected|static|open|extern)\\s+)*(val|var)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z_][A-Za-z0-9_]*))?", RegexOption.MULTILINE)
+        val valRe = Regex("^\\s*(val|var)\\s+([A-Za-z_][A-Za-z0-9_]*)\\s*(?::\\s*([A-Za-z_][A-Za-z0-9_]*))?", RegexOption.MULTILINE)
         for (m in valRe.findAll(body)) {
             val kind = m.groupValues.getOrNull(1) ?: continue
             val name = m.groupValues.getOrNull(2) ?: continue

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/Obj.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -89,12 +89,18 @@ open class Obj {
         for (cls in objClass.mro) {
             if (cls.className == "Obj") break
             val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
-            if (rec != null && !rec.isAbstract && rec.type != ObjRecord.Type.Property) {
+            if (rec != null) {
                 val decl = rec.declaringClass ?: cls
                 val caller = scope.currentClassCtx
                 if (!canAccessMember(rec.visibility, decl, caller))
-                    scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
+                    scope.raiseError(ObjAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
-                return rec.value.invoke(scope, this, args, decl)
+                val saved = scope.currentClassCtx
+                scope.currentClassCtx = decl
+                try {
+                    return rec.value.invoke(scope, this, args)
+                } finally {
+                    scope.currentClassCtx = saved
+                }
             }
         }
 
@@ -111,8 +117,14 @@ open class Obj {
                     val decl = rec.declaringClass ?: cls
                     val caller = scope.currentClassCtx
                     if (!canAccessMember(rec.visibility, decl, caller))
-                        scope.raiseError(ObjIllegalAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
+                        scope.raiseError(ObjAccessException(scope, "can't invoke ${name}: not visible (declared in ${decl.className}, caller ${caller?.className ?: "?"})"))
-                    return rec.value.invoke(scope, this, args, decl)
+                    val saved = scope.currentClassCtx
+                    scope.currentClassCtx = decl
+                    try {
+                        return rec.value.invoke(scope, this, args)
+                    } finally {
+                        scope.currentClassCtx = saved
+                    }
                 }
             }
         }
@@ -137,8 +149,6 @@ open class Obj {
     // methods that to override
 
     open suspend fun compareTo(scope: Scope, other: Obj): Int {
-        if( other === this) return 0
-        if( other === ObjNull ) return 2
         scope.raiseNotImplemented()
     }
 
@@ -335,12 +345,8 @@ open class Obj {
         // 1. Hierarchy members (excluding root fallback)
         for (cls in objClass.mro) {
             if (cls.className == "Obj") break
-            val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
+            cls.members[name]?.let { return resolveRecord(scope, it, name, it.declaringClass) }
-            if (rec != null) {
+            cls.classScope?.objects?.get(name)?.let { return resolveRecord(scope, it, name, it.declaringClass) }
-                if (!rec.isAbstract) {
-                    return resolveRecord(scope, rec, name, rec.declaringClass)
-                }
-            }
         }
 
         // 2. Extensions
@@ -364,14 +370,7 @@ open class Obj {
         )
     }
 
-    protected open suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
+    protected suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
-        if (obj.type == ObjRecord.Type.Delegated) {
-            val del = obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
-            return obj.copy(
-                value = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name))),
-                type = ObjRecord.Type.Other
-            )
-        }
         val value = obj.value
         if (value is ObjProperty) {
             return ObjRecord(value.callGetter(scope, this, decl), obj.isMutable)
@@ -382,7 +381,7 @@ open class Obj {
         val caller = scope.currentClassCtx
         // Check visibility for non-property members here if they weren't checked before
         if (!canAccessMember(obj.visibility, decl, caller))
-            scope.raiseError(ObjIllegalAccessException(scope, "can't access field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
+            scope.raiseError(ObjAccessException(scope, "can't access field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
         return obj
     }
 
@@ -392,11 +391,8 @@ open class Obj {
         // 1. Hierarchy members (excluding root fallback)
         for (cls in objClass.mro) {
             if (cls.className == "Obj") break
-            val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
+            field = cls.members[name] ?: cls.classScope?.objects?.get(name)
-            if (rec != null && !rec.isAbstract) {
+            if (field != null) break
-                field = rec
-                break
-            }
         }
         // 2. Extensions
         if (field == null) {
@@ -418,12 +414,9 @@ open class Obj {
 
         val decl = field.declaringClass
         val caller = scope.currentClassCtx
-        if (!canAccessMember(field.effectiveWriteVisibility, decl, caller))
+        if (!canAccessMember(field.visibility, decl, caller))
-            scope.raiseError(ObjIllegalAccessException(scope, "can't assign field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
+            scope.raiseError(ObjAccessException(scope, "can't assign field ${name}: not visible (declared in ${decl?.className ?: "?"}, caller ${caller?.className ?: "?"})"))
-        if (field.type == ObjRecord.Type.Delegated) {
+        if (field.value is ObjProperty) {
-            val del = field.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
-            del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
-        } else if (field.value is ObjProperty) {
             (field.value as ObjProperty).callSetter(scope, this, newValue, decl)
         } else if (field.isMutable) field.value = newValue else scope.raiseError("can't assign to read-only field: $name")
     }
@@ -442,17 +435,13 @@ open class Obj {
         scope.raiseNotImplemented()
     }
 
-    suspend fun invoke(scope: Scope, thisObj: Obj, args: Arguments, declaringClass: ObjClass? = null): Obj {
+    suspend fun invoke(scope: Scope, thisObj: Obj, args: Arguments): Obj =
-        if (PerfFlags.SCOPE_POOL) {
+        if (PerfFlags.SCOPE_POOL)
-            return scope.withChildFrame(args, newThisObj = thisObj) { child ->
+            scope.withChildFrame(args, newThisObj = thisObj) { child ->
-                if (declaringClass != null) child.currentClassCtx = declaringClass
                 callOn(child)
             }
-        }
+        else
-        val child = scope.createChildScope(scope.pos, args = args, newThisObj = thisObj)
+            callOn(scope.createChildScope(scope.pos, args = args, newThisObj = thisObj))
-        if (declaringClass != null) child.currentClassCtx = declaringClass
-        return callOn(child)
-    }
 
     suspend fun invoke(scope: Scope, thisObj: Obj, vararg args: Obj): Obj =
         callOn(
@@ -674,50 +663,6 @@ object ObjNull : Obj() {
     }
 }
 
-@Serializable
-@SerialName("unset")
-object ObjUnset : Obj() {
-    override suspend fun compareTo(scope: Scope, other: Obj): Int = if (other === this) 0 else -1
-    override fun equals(other: Any?): Boolean = other === this
-    override fun toString(): String = "Unset"
-
-    override suspend fun readField(scope: Scope, name: String): ObjRecord = scope.raiseUnset()
-    override suspend fun invokeInstanceMethod(
-        scope: Scope,
-        name: String,
-        args: Arguments,
-        onNotFoundResult: (suspend () -> Obj?)?
-    ): Obj = scope.raiseUnset()
-
-    override suspend fun getAt(scope: Scope, index: Obj): Obj = scope.raiseUnset()
-    override suspend fun putAt(scope: Scope, index: Obj, newValue: Obj) = scope.raiseUnset()
-    override suspend fun callOn(scope: Scope): Obj = scope.raiseUnset()
-    override suspend fun plus(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun minus(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun negate(scope: Scope): Obj = scope.raiseUnset()
-    override suspend fun mul(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun div(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun mod(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun logicalNot(scope: Scope): Obj = scope.raiseUnset()
-    override suspend fun logicalAnd(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun logicalOr(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun operatorMatch(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun bitAnd(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun bitOr(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun bitXor(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun shl(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun shr(scope: Scope, other: Obj): Obj = scope.raiseUnset()
-    override suspend fun bitNot(scope: Scope): Obj = scope.raiseUnset()
-
-    override val objClass: ObjClass by lazy {
-        object : ObjClass("Unset") {
-            override suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj {
-                return ObjUnset
-            }
-        }
-    }
-}
-
 /**
  * TODO: get rid of it. Maybe we ise some Lyng inheritance instead
  */

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjClass.kt

@@ -91,8 +91,6 @@ open class ObjClass(
     vararg parents: ObjClass,
 ) : Obj() {
 
-    var isAbstract: Boolean = false
-
     // Stable identity and simple structural version for PICs
     val classId: Long = ClassIdGen.nextId()
     var layoutVersion: Int = 0
@@ -180,13 +178,7 @@ open class ObjClass(
     val mro: List<ObjClass> by lazy {
         val base = c3Linearize(this, mutableMapOf())
         if (this.className == "Obj" || base.any { it.className == "Obj" }) base
-        else {
+        else base + rootObjectType
-            // During very early bootstrap rootObjectType might not be initialized yet.
-            // We use a safe check here.
-            @Suppress("UNNECESSARY_SAFE_CALL")
-            val root = net.sergeych.lyng.obj.Obj.rootObjectType
-            if (root != null) base + root else base
-        }
     }
 
     /** Parents in C3 order (no self). */
@@ -197,7 +189,7 @@ open class ObjClass(
         val list = mutableListOf<String>()
         if (includeSelf) list += className
         mroParents.forEach { list += it.className }
-        return list.joinToString(", ")
+        return list.joinToString(" → ")
     }
 
     override val objClass: ObjClass by lazy { ObjClassType }
@@ -212,7 +204,6 @@ open class ObjClass(
     override suspend fun compareTo(scope: Scope, other: Obj): Int = if (other === this) 0 else -1
 
     override suspend fun callOn(scope: Scope): Obj {
-        if (isAbstract) scope.raiseError("can't instantiate abstract class $className")
         val instance = createInstance(scope)
         initializeInstance(instance, scope.args, runConstructors = true)
         return instance
@@ -234,13 +225,13 @@ open class ObjClass(
         // This mirrors Obj.autoInstanceScope behavior for ad-hoc scopes and makes fb.method() resolution robust
         // 1) members-defined methods
         for ((k, v) in members) {
-            if (v.value is Statement || v.type == ObjRecord.Type.Delegated) {
+            if (v.value is Statement) {
                 instance.instanceScope.objects[k] = v
             }
         }
         // 2) class-scope methods registered during class-body execution
         classScope?.objects?.forEach { (k, rec) ->
-            if (rec.value is Statement || rec.type == ObjRecord.Type.Delegated) {
+            if (rec.value is Statement) {
                 // if not already present, copy reference for dispatch
                 if (!instance.instanceScope.objects.containsKey(k)) {
                     instance.instanceScope.objects[k] = rec
@@ -354,60 +345,17 @@ open class ObjClass(
         initialValue: Obj,
         isMutable: Boolean = false,
         visibility: Visibility = Visibility.Public,
-        writeVisibility: Visibility? = null,
         pos: Pos = Pos.builtIn,
-        declaringClass: ObjClass? = this,
+        declaringClass: ObjClass? = this
-        isAbstract: Boolean = false,
+    ) {
-        isClosed: Boolean = false,
-        isOverride: Boolean = false,
-        type: ObjRecord.Type = ObjRecord.Type.Field,
-    ): ObjRecord {
-        // Validation of override rules: only for non-system declarations
-        if (pos != Pos.builtIn) {
-            val existing = getInstanceMemberOrNull(name)
-            var actualOverride = false
-            if (existing != null && existing.declaringClass != this) {
-                // 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.
-                if (!existing.visibility.isPublic && !canAccessMember(existing.visibility, existing.declaringClass, this)) {
-                    // It's effectively not there for us, so actualOverride remains false
-                } else {
-                    actualOverride = true
-                    // It's an override (implicit or explicit)
-                    if (existing.isClosed)
-                        throw ScriptError(pos, "can't override closed member $name from ${existing.declaringClass?.className}")
-                    
-                    if (!isOverride)
-                        throw ScriptError(pos, "member $name overrides parent member but 'override' keyword is missing")
-
-                    if (visibility.ordinal > existing.visibility.ordinal)
-                        throw ScriptError(pos, "can't narrow visibility of $name from ${existing.visibility} to $visibility")
-                }
-            }
-            
-            if (isOverride && !actualOverride) {
-                throw ScriptError(pos, "member $name is marked 'override' but does not override anything")
-            }
-        }
-
         // Allow overriding ancestors: only prevent redefinition if THIS class already defines an immutable member
         val existingInSelf = members[name]
         if (existingInSelf != null && existingInSelf.isMutable == false)
             throw ScriptError(pos, "$name is already defined in $objClass")
-        
         // Install/override in this class
-        val rec = ObjRecord(
+        members[name] = ObjRecord(initialValue, isMutable, visibility, declaringClass = declaringClass)
-            initialValue, isMutable, visibility, writeVisibility, 
-            declaringClass = declaringClass,
-            isAbstract = isAbstract,
-            isClosed = isClosed,
-            isOverride = isOverride,
-            type = type
-        )
-        members[name] = rec
         // Structural change: bump layout version for PIC invalidation
         layoutVersion += 1
-        return rec
     }
 
     private fun initClassScope(): Scope {
@@ -420,38 +368,26 @@ open class ObjClass(
         initialValue: Obj,
         isMutable: Boolean = false,
         visibility: Visibility = Visibility.Public,
-        writeVisibility: Visibility? = null,
+        pos: Pos = Pos.builtIn
-        pos: Pos = Pos.builtIn,
+    ) {
-        type: ObjRecord.Type = ObjRecord.Type.Field
-    ): ObjRecord {
         initClassScope()
         val existing = classScope!!.objects[name]
         if (existing != null)
             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)
+        classScope!!.addItem(name, isMutable, initialValue, visibility)
         // Structural change: bump layout version for PIC invalidation
         layoutVersion += 1
-        return rec
     }
 
     fun addFn(
         name: String,
-        isMutable: Boolean = false,
+        isOpen: Boolean = false,
         visibility: Visibility = Visibility.Public,
-        writeVisibility: Visibility? = null,
         declaringClass: ObjClass? = this,
-        isAbstract: Boolean = false,
+        code: suspend Scope.() -> Obj
-        isClosed: Boolean = false,
-        isOverride: Boolean = false,
-        pos: Pos = Pos.builtIn,
-        code: (suspend Scope.() -> Obj)? = null
     ) {
-        val stmt = code?.let { statement { it() } } ?: ObjNull
+        val stmt = statement { code() }
-        createField(
+        createField(name, stmt, isOpen, visibility, Pos.builtIn, declaringClass)
-            name, stmt, isMutable, visibility, writeVisibility, pos, declaringClass,
-            isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
-            type = ObjRecord.Type.Fun
-        )
     }
 
     fun addConst(name: String, value: Obj) = createField(name, value, isMutable = false)
@@ -461,21 +397,13 @@ open class ObjClass(
         getter: (suspend Scope.() -> Obj)? = null,
         setter: (suspend Scope.(Obj) -> Unit)? = null,
         visibility: Visibility = Visibility.Public,
-        writeVisibility: Visibility? = null,
+        declaringClass: ObjClass? = this
-        declaringClass: ObjClass? = this,
-        isAbstract: Boolean = false,
-        isClosed: Boolean = false,
-        isOverride: Boolean = false,
-        pos: Pos = Pos.builtIn,
     ) {
         val g = getter?.let { statement { it() } }
         val s = setter?.let { statement { it(requiredArg(0)); ObjVoid } }
-        val prop = if (isAbstract) ObjNull else ObjProperty(name, g, s)
+        val prop = ObjProperty(name, g, s)
-        createField(
+        members[name] = ObjRecord(prop, false, visibility, declaringClass, type = ObjRecord.Type.Property)
-            name, prop, false, visibility, writeVisibility, pos, declaringClass,
+        layoutVersion += 1
-            isAbstract = isAbstract, isClosed = isClosed, isOverride = isOverride,
-            type = ObjRecord.Type.Property
-        )
     }
 
     fun addClassConst(name: String, value: Obj) = createClassField(name, value)
@@ -510,38 +438,6 @@ open class ObjClass(
         getInstanceMemberOrNull(name)
             ?: throw ScriptError(atPos, "symbol doesn't exist: $name")
 
-    fun findFirstConcreteMember(name: String): ObjRecord? {
-        for (cls in mro) {
-            cls.members[name]?.let {
-                if (!it.isAbstract) return it
-            }
-        }
-        return null
-    }
-
-    fun checkAbstractSatisfaction(pos: Pos) {
-        if (isAbstract) return
-
-        val missing = mutableSetOf<String>()
-        for (cls in mroParents) {
-            for ((name, rec) in cls.members) {
-                if (rec.isAbstract) {
-                    val current = findFirstConcreteMember(name)
-                    if (current == null) {
-                        missing.add(name)
-                    }
-                }
-            }
-        }
-
-        if (missing.isNotEmpty()) {
-            throw ScriptError(
-                pos,
-                "class $className is not abstract and does not implement abstract members: ${missing.joinToString(", ")}"
-            )
-        }
-    }
-
     /**
      * Resolve member starting from a specific ancestor class [start], not from this class.
      * Searches [start] first, then traverses its linearized parents.
@@ -562,21 +458,15 @@ open class ObjClass(
 
     override suspend fun readField(scope: Scope, name: String): ObjRecord {
         classScope?.objects?.get(name)?.let {
-            if (it.visibility.isPublic) return resolveRecord(scope, it, name, this)
+            if (it.visibility.isPublic) return it
         }
         return super.readField(scope, name)
     }
 
     override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
-        initClassScope().objects[name]?.let { rec ->
+        initClassScope().objects[name]?.let {
-            if (rec.type == ObjRecord.Type.Delegated) {
+            if (it.isMutable) it.value = newValue
-                val del = rec.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate")
-                del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
-                return
-            }
-            if (rec.isMutable) rec.value = newValue
             else scope.raiseIllegalAssignment("can't assign $name is not mutable")
-            return
         }
             ?: super.writeField(scope, name, newValue)
     }
@@ -585,16 +475,8 @@ open class ObjClass(
         scope: Scope, name: String, args: Arguments,
         onNotFoundResult: (suspend () -> Obj?)?
     ): Obj {
-        getInstanceMemberOrNull(name)?.let { rec ->
+        return classScope?.objects?.get(name)?.value?.invoke(scope, this, args)
-            val decl = rec.declaringClass ?: findDeclaringClassOf(name) ?: this
+            ?: super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
-            if (rec.type == ObjRecord.Type.Delegated) {
-                val del = rec.delegate ?: scope.raiseError("Internal error: delegated function $name has no delegate")
-                val allArgs = (listOf(this, ObjString(name)) + args.list).toTypedArray()
-                return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs))
-            }
-            return rec.value.invoke(scope, this, args, decl)
-        }
-        return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
     }
 
     open suspend fun deserialize(scope: Scope, decoder: LynonDecoder, lynonType: LynonType?): Obj =

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjException.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -191,13 +191,10 @@ open class ObjException(
                 "IllegalAssignmentException",
                 "SymbolNotDefinedException",
                 "IterationEndException",
-                "IllegalAccessException",
+                "AccessException",
                 "UnknownException",
                 "NotFoundException",
-                "IllegalOperationException",
+                "IllegalOperationException"
-                "UnsetException",
-                "NotImplementedException",
-                "SyntaxError"
             )) {
                 scope.addConst(name, getOrCreateExceptionClass(name))
             }
@@ -237,8 +234,8 @@ class ObjSymbolNotDefinedException(scope: Scope, message: String = "symbol is no
 class ObjIterationFinishedException(scope: Scope) :
     ObjException("IterationEndException", scope, "iteration finished")
 
-class ObjIllegalAccessException(scope: Scope, message: String = "access not allowed error") :
+class ObjAccessException(scope: Scope, message: String = "access not allowed error") :
-    ObjException("IllegalAccessException", scope, message)
+    ObjException("AccessException", scope, message)
 
 class ObjUnknownException(scope: Scope, message: String = "access not allowed error") :
     ObjException("UnknownException", scope, message)
@@ -248,9 +245,3 @@ class ObjIllegalOperationException(scope: Scope, message: String = "Operation is
 
 class ObjNotFoundException(scope: Scope, message: String = "not found") :
     ObjException("NotFoundException", scope, message)
-
-class ObjUnsetException(scope: Scope, message: String = "property is unset (not initialized)") :
-    ObjException("UnsetException", scope, message)
-
-class ObjNotImplementedException(scope: Scope, message: String = "not implemented") :
-    ObjException("NotImplementedException", scope, message)

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjInstance.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
     internal lateinit var instanceScope: Scope
 
     override suspend fun readField(scope: Scope, name: String): ObjRecord {
-        // 1. Direct (unmangled) lookup first
+        // Direct (unmangled) lookup first
         instanceScope[name]?.let { rec ->
             val decl = rec.declaringClass
             // Allow unconditional access when accessing through `this` of the same instance
@@ -40,26 +40,33 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
                 val caller = scope.currentClassCtx
                 if (!canAccessMember(rec.visibility, decl, caller))
                     scope.raiseError(
-                        ObjIllegalAccessException(
+                        ObjAccessException(
                             scope,
                             "can't access field $name (declared in ${decl?.className ?: "?"})"
                         )
                     )
             }
-            return resolveRecord(scope, rec, name, decl)
+            if (rec.type == ObjRecord.Type.Property) {
+                val prop = rec.value as ObjProperty
+                return rec.copy(value = prop.callGetter(scope, this, decl))
+            }
+            return rec
         }
-
+        // Try MI-mangled lookup along linearization (C3 MRO): ClassName::name
-        // 2. MI-mangled instance scope lookup
         val cls = objClass
-        fun findMangledInRead(): ObjRecord? {
+
+        // self first, then parents
+        fun findMangled(): ObjRecord? {
+            // self
             instanceScope.objects["${cls.className}::$name"]?.let { return it }
+            // ancestors in deterministic C3 order
             for (p in cls.mroParents) {
                 instanceScope.objects["${p.className}::$name"]?.let { return it }
             }
             return null
         }
-
+        findMangled()?.let { rec ->
-        findMangledInRead()?.let { rec ->
+            // derive declaring class by mangled prefix: try self then parents
             val declaring = when {
                 instanceScope.objects.containsKey("${cls.className}::$name") -> cls
                 else -> cls.mroParents.firstOrNull { instanceScope.objects.containsKey("${it.className}::$name") }
@@ -68,36 +75,20 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
                 val caller = scope.currentClassCtx
                 if (!canAccessMember(rec.visibility, declaring, caller))
                     scope.raiseError(
-                        ObjIllegalAccessException(
+                        ObjAccessException(
                             scope,
                             "can't access field $name (declared in ${declaring?.className ?: "?"})"
                         )
                     )
             }
-            return resolveRecord(scope, rec, name, declaring)
+            if (rec.type == ObjRecord.Type.Property) {
-        }
+                val prop = rec.value as ObjProperty
-
+                return rec.copy(value = prop.callGetter(scope, this, declaring))
-        // 3. Fall back to super (handles class members and extensions)
-        return super.readField(scope, name)
-    }
-
-    override suspend fun resolveRecord(scope: Scope, obj: ObjRecord, name: String, decl: ObjClass?): ObjRecord {
-        if (obj.type == ObjRecord.Type.Delegated) {
-            val storageName = "${decl?.className}::$name"
-            var del = instanceScope[storageName]?.delegate
-            if (del == null) {
-                for (c in objClass.mro) {
-                    del = instanceScope["${c.className}::$name"]?.delegate
-                    if (del != null) break
-                }
             }
-            del = del ?: obj.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
+            return rec
-            return obj.copy(
-                value = del.invokeInstanceMethod(scope, "getValue", Arguments(this, ObjString(name))),
-                type = ObjRecord.Type.Other
-            )
         }
-        return super.resolveRecord(scope, obj, name, decl)
+        // Fall back to methods/properties on class
+        return super.readField(scope, name)
     }
 
     override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
@@ -106,8 +97,8 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
             val decl = f.declaringClass
             if (scope.thisObj !== this || scope.currentClassCtx == null) {
                 val caller = scope.currentClassCtx
-                if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
+                if (!canAccessMember(f.visibility, decl, caller))
-                    ObjIllegalAccessException(
+                    ObjIllegalAssignmentException(
                         scope,
                         "can't assign to field $name (declared in ${decl?.className ?: "?"})"
                     ).raise()
@@ -117,20 +108,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
                 prop.callSetter(scope, this, newValue, decl)
                 return
             }
-            if (f.type == ObjRecord.Type.Delegated) {
+            if (!f.isMutable) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
-                val storageName = "${decl?.className}::$name"
-                var del = instanceScope[storageName]?.delegate
-                if (del == null) {
-                    for (c in objClass.mro) {
-                        del = instanceScope["${c.className}::$name"]?.delegate
-                        if (del != null) break
-                    }
-                }
-                del = del ?: f.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
-                del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
-                return
-            }
-            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
@@ -153,8 +131,8 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
             }
             if (scope.thisObj !== this || scope.currentClassCtx == null) {
                 val caller = scope.currentClassCtx
-                if (!canAccessMember(rec.effectiveWriteVisibility, declaring, caller))
+                if (!canAccessMember(rec.visibility, declaring, caller))
-                    ObjIllegalAccessException(
+                    ObjIllegalAssignmentException(
                         scope,
                         "can't assign to field $name (declared in ${declaring?.className ?: "?"})"
                     ).raise()
@@ -164,20 +142,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
                 prop.callSetter(scope, this, newValue, declaring)
                 return
             }
-            if (rec.type == ObjRecord.Type.Delegated) {
+            if (!rec.isMutable) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
-                val storageName = "${declaring?.className}::$name"
-                var del = instanceScope[storageName]?.delegate
-                if (del == null) {
-                    for (c in objClass.mro) {
-                        del = instanceScope["${c.className}::$name"]?.delegate
-                        if (del != null) break
-                    }
-                }
-                del = del ?: rec.delegate ?: scope.raiseError("Internal error: delegated property $name has no delegate (tried $storageName)")
-                del.invokeInstanceMethod(scope, "setValue", Arguments(this, ObjString(name), newValue))
-                return
-            }
-            if (!rec.isMutable && rec.value !== ObjUnset) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
             if (rec.value.assign(scope, newValue) == null)
                 rec.value = newValue
             return
@@ -188,42 +153,39 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
     override suspend fun invokeInstanceMethod(
         scope: Scope, name: String, args: Arguments,
         onNotFoundResult: (suspend () -> Obj?)?
-    ): Obj {
+    ): Obj =
-        // 1. Walk MRO to find member, handling delegation
+        instanceScope[name]?.let { rec ->
-        for (cls in objClass.mro) {
+            val decl = rec.declaringClass
-            if (cls.className == "Obj") break
+            val caller = scope.currentClassCtx ?: if (scope.thisObj === this) objClass else null
-            val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
+            if (!canAccessMember(rec.visibility, decl, caller))
-            if (rec != null) {
+                scope.raiseError(
-                if (rec.type == ObjRecord.Type.Delegated) {
+                    ObjAccessException(
-                    val storageName = "${cls.className}::$name"
+                        scope,
-                    val del = instanceScope[storageName]?.delegate ?: rec.delegate
+                        "can't invoke method $name (declared in ${decl?.className ?: "?"})"
-                    ?: scope.raiseError("Internal error: delegated function $name has no delegate (tried $storageName)")
+                    )
-                    val allArgs = (listOf(this, ObjString(name)) + args.list).toTypedArray()
+                )
-                    return del.invokeInstanceMethod(scope, "invoke", Arguments(*allArgs))
+            rec.value.invoke(
-                }
+                instanceScope,
-                if (rec.type != ObjRecord.Type.Property && !rec.isAbstract) {
+                this,
-                    val decl = rec.declaringClass ?: cls
+                args
+            )
+        }
+            ?: run {
+                // fallback: class-scope function (registered during class body execution)
+                objClass.classScope?.objects?.get(name)?.let { rec ->
+                    val decl = rec.declaringClass
                     val caller = scope.currentClassCtx ?: if (scope.thisObj === this) objClass else null
                     if (!canAccessMember(rec.visibility, decl, caller))
                         scope.raiseError(
-                            ObjIllegalAccessException(
+                            ObjAccessException(
                                 scope,
-                                "can't invoke method $name (declared in ${decl.className ?: "?"})"
+                                "can't invoke method $name (declared in ${decl?.className ?: "?"})"
                             )
                         )
-                    return rec.value.invoke(
+                    rec.value.invoke(instanceScope, this, args)
-                        instanceScope,
-                        this,
-                        args,
-                        decl
-                    )
                 }
             }
-        }
+            ?: super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
-
-        // 2. Fall back to super (handles extensions and root fallback)
-        return super.invokeInstanceMethod(scope, name, args, onNotFoundResult)
-    }
 
     private val publicFields: Map<String, ObjRecord>
         get() = instanceScope.objects.filter {
@@ -309,7 +271,7 @@ class ObjInstance(override val objClass: ObjClass) : Obj() {
 
     protected val comparableVars: Map<String, ObjRecord> by lazy {
         instanceScope.objects.filter {
-            it.value.type.comparable && (it.value.type != ObjRecord.Type.Field || it.value.isMutable)
+            it.value.type.comparable
         }
     }
 
@@ -344,8 +306,8 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
             val decl = rec.declaringClass ?: startClass
             val caller = scope.currentClassCtx
             if (!canAccessMember(rec.visibility, decl, caller))
-                scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
+                scope.raiseError(ObjAccessException(scope, "can't access field $name (declared in ${decl.className})"))
-            return resolveRecord(scope, rec, name, decl)
+            return rec
         }
         // Then try instance locals (unmangled) only if startClass is the dynamic class itself
         if (startClass === instance.objClass) {
@@ -354,12 +316,12 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
                 val caller = scope.currentClassCtx
                 if (!canAccessMember(rec.visibility, decl, caller))
                     scope.raiseError(
-                        ObjIllegalAccessException(
+                        ObjAccessException(
                             scope,
                             "can't access field $name (declared in ${decl?.className ?: "?"})"
                         )
                     )
-                return resolveRecord(scope, rec, name, decl)
+                return rec
             }
         }
         // Finally try methods/properties starting from ancestor
@@ -367,9 +329,19 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
         val decl = r.declaringClass ?: startClass
         val caller = scope.currentClassCtx
         if (!canAccessMember(r.visibility, decl, caller))
-            scope.raiseError(ObjIllegalAccessException(scope, "can't access field $name (declared in ${decl.className})"))
+            scope.raiseError(ObjAccessException(scope, "can't access field $name (declared in ${decl.className})"))
-        
+        return when (val value = r.value) {
-        return resolveRecord(scope, r, name, decl)
+            is net.sergeych.lyng.Statement -> ObjRecord(
+                value.execute(
+                    instance.instanceScope.createChildScope(
+                        scope.pos,
+                        newThisObj = instance
+                    )
+                ), r.isMutable
+            )
+
+            else -> r
+        }
     }
 
     override suspend fun writeField(scope: Scope, name: String, newValue: Obj) {
@@ -378,12 +350,12 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
         instance.instanceScope.objects[mangled]?.let { f ->
             val decl = f.declaringClass ?: startClass
             val caller = scope.currentClassCtx
-            if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
+            if (!canAccessMember(f.visibility, decl, caller))
-                ObjIllegalAccessException(
+                ObjIllegalAssignmentException(
                     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.isMutable) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
             if (f.value.assign(scope, newValue) == null) f.value = newValue
             return
         }
@@ -392,12 +364,12 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
             instance.instanceScope[name]?.let { f ->
                 val decl = f.declaringClass ?: instance.objClass.findDeclaringClassOf(name)
                 val caller = scope.currentClassCtx
-                if (!canAccessMember(f.effectiveWriteVisibility, decl, caller))
+                if (!canAccessMember(f.visibility, decl, caller))
-                    ObjIllegalAccessException(
+                    ObjIllegalAssignmentException(
                         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.isMutable) ObjIllegalAssignmentException(scope, "can't reassign val $name").raise()
                 if (f.value.assign(scope, newValue) == null) f.value = newValue
                 return
             }
@@ -405,8 +377,8 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
         val r = memberFromAncestor(name) ?: scope.raiseError("no such field: $name")
         val decl = r.declaringClass ?: startClass
         val caller = scope.currentClassCtx
-        if (!canAccessMember(r.effectiveWriteVisibility, decl, caller))
+        if (!canAccessMember(r.visibility, decl, caller))
-            ObjIllegalAccessException(scope, "can't assign to field $name (declared in ${decl.className})").raise()
+            ObjIllegalAssignmentException(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.value.assign(scope, newValue) == null) r.value = newValue
     }
@@ -422,7 +394,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
             val decl = rec.declaringClass ?: startClass
             val caller = scope.currentClassCtx
             if (!canAccessMember(rec.visibility, decl, caller))
-                scope.raiseError(ObjIllegalAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
+                scope.raiseError(ObjAccessException(scope, "can't invoke method $name (declared in ${decl.className})"))
             val saved = instance.instanceScope.currentClassCtx
             instance.instanceScope.currentClassCtx = decl
             try {
@@ -438,7 +410,7 @@ class ObjQualifiedView(val instance: ObjInstance, private val startClass: ObjCla
                 val caller = scope.currentClassCtx
                 if (!canAccessMember(rec.visibility, decl, caller))
                     scope.raiseError(
-                        ObjIllegalAccessException(
+                        ObjAccessException(
                             scope,
                             "can't invoke method $name (declared in ${decl?.className ?: "?"})"
                         )

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRecord.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -26,18 +26,12 @@ data class ObjRecord(
     var value: Obj,
     val isMutable: Boolean,
     val visibility: Visibility = Visibility.Public,
-    val writeVisibility: Visibility? = null,
     /** If non-null, denotes the class that declared this member (field/method). */
     val declaringClass: ObjClass? = null,
     var importedFrom: Scope? = null,
     val isTransient: Boolean = false,
     val type: Type = Type.Other,
-    val isAbstract: Boolean = false,
-    val isClosed: Boolean = false,
-    val isOverride: Boolean = false,
-    var delegate: Obj? = null,
 ) {
-    val effectiveWriteVisibility: Visibility get() = writeVisibility ?: visibility
     enum class Type(val comparable: Boolean = false,val serializable: Boolean = false) {
         Field(true, true),
         @Suppress("unused")
@@ -49,7 +43,6 @@ data class ObjRecord(
         Class,
         Enum,
         Property,
-        Delegated,
         Other;
 
         val isArgument get() = this == Argument

lynglib/src/commonMain/kotlin/net/sergeych/lyng/obj/ObjRef.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -32,11 +32,7 @@ sealed interface ObjRef {
      * Fast path for evaluating an expression to a raw Obj value without wrapping it into ObjRecord.
      * Default implementation calls [get] and returns its value. Nodes can override to avoid record traffic.
      */
-    suspend fun evalValue(scope: Scope): Obj {
+    suspend fun evalValue(scope: Scope): Obj = get(scope).value
-        val rec = get(scope)
-        if (rec.type == ObjRecord.Type.Delegated) return scope.resolve(rec, "unknown")
-        return rec.value
-    }
     suspend fun setAt(pos: Pos, scope: Scope, newValue: Obj) {
         throw ScriptError(pos, "can't assign value")
     }
@@ -83,7 +79,8 @@ enum class BinOp {
 /** R-value reference for unary operations. */
 class UnaryOpRef(private val op: UnaryOp, private val a: ObjRef) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val v = a.evalValue(scope)
+        val fastRval = PerfFlags.RVAL_FASTPATH
+        val v = if (fastRval) a.evalValue(scope) else a.get(scope).value
         if (PerfFlags.PRIMITIVE_FASTOPS) {
             val rFast: Obj? = when (op) {
                 UnaryOp.NOT -> if (v is ObjBool) if (!v.value) ObjTrue else ObjFalse else null
@@ -111,8 +108,8 @@ class UnaryOpRef(private val op: UnaryOp, private val a: ObjRef) : ObjRef {
 /** R-value reference for binary operations. */
 class BinaryOpRef(private val op: BinOp, private val left: ObjRef, private val right: ObjRef) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val a = left.evalValue(scope)
+        val a = if (PerfFlags.RVAL_FASTPATH) left.evalValue(scope) else left.get(scope).value
-        val b = right.evalValue(scope)
+        val b = if (PerfFlags.RVAL_FASTPATH) right.evalValue(scope) else right.get(scope).value
 
         // Primitive fast paths for common cases (guarded by PerfFlags.PRIMITIVE_FASTOPS)
         if (PerfFlags.PRIMITIVE_FASTOPS) {
@@ -280,7 +277,7 @@ class ConditionalRef(
     private val ifFalse: ObjRef
 ) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val condVal = condition.evalValue(scope)
+        val condVal = if (PerfFlags.RVAL_FASTPATH) condition.evalValue(scope) else condition.get(scope).value
         val condTrue = when (condVal) {
             is ObjBool -> condVal.value
             is ObjInt -> condVal.value != 0L
@@ -299,8 +296,8 @@ class CastRef(
     private val atPos: Pos,
 ) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val v0 = valueRef.evalValue(scope)
+        val v0 = if (PerfFlags.RVAL_FASTPATH) valueRef.evalValue(scope) else valueRef.get(scope).value
-        val t = typeRef.evalValue(scope)
+        val t = if (PerfFlags.RVAL_FASTPATH) typeRef.evalValue(scope) else typeRef.get(scope).value
         val target = (t as? ObjClass) ?: scope.raiseClassCastError("${'$'}t is not the class instance")
         // unwrap qualified views
         val v = when (v0) {
@@ -342,8 +339,8 @@ class AssignOpRef(
     private val atPos: Pos,
 ) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val x = target.evalValue(scope)
+        val x = target.get(scope).value
-        val y = value.evalValue(scope)
+        val y = if (PerfFlags.RVAL_FASTPATH) value.evalValue(scope) else value.get(scope).value
         val inPlace: Obj? = when (op) {
             BinOp.PLUS -> x.plusAssign(scope, y)
             BinOp.MINUS -> x.minusAssign(scope, y)
@@ -376,7 +373,7 @@ class IncDecRef(
     override suspend fun get(scope: Scope): ObjRecord {
         val rec = target.get(scope)
         if (!rec.isMutable) scope.raiseError("Cannot ${if (isIncrement) "increment" else "decrement"} immutable value")
-        val v = scope.resolve(rec, "unknown")
+        val v = rec.value
         val one = ObjInt.One
         // We now treat numbers as immutable and always perform write-back via setAt.
         // This avoids issues where literals are shared and mutated in-place.
@@ -390,8 +387,9 @@ class IncDecRef(
 /** Elvis operator reference: a ?: b */
 class ElvisRef(private val left: ObjRef, private val right: ObjRef) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val a = left.evalValue(scope)
+        val fastRval = PerfFlags.RVAL_FASTPATH
-        val r = if (a != ObjNull) a else right.evalValue(scope)
+        val a = if (fastRval) left.evalValue(scope) else left.get(scope).value
+        val r = if (a != ObjNull) a else if (fastRval) right.evalValue(scope) else right.get(scope).value
         return r.asReadonly
     }
 }
@@ -399,10 +397,12 @@ class ElvisRef(private val left: ObjRef, private val right: ObjRef) : ObjRef {
 /** Logical OR with short-circuit: a || b */
 class LogicalOrRef(private val left: ObjRef, private val right: ObjRef) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val a = left.evalValue(scope)
+        val fastRval = PerfFlags.RVAL_FASTPATH
+        val fastPrim = PerfFlags.PRIMITIVE_FASTOPS
+        val a = if (fastRval) left.evalValue(scope) else left.get(scope).value
         if ((a as? ObjBool)?.value == true) return ObjTrue.asReadonly
-        val b = right.evalValue(scope)
+        val b = if (fastRval) right.evalValue(scope) else right.get(scope).value
-        if (PerfFlags.PRIMITIVE_FASTOPS) {
+        if (fastPrim) {
             if (a is ObjBool && b is ObjBool) {
                 return if (a.value || b.value) ObjTrue.asReadonly else ObjFalse.asReadonly
             }
@@ -414,10 +414,13 @@ class LogicalOrRef(private val left: ObjRef, private val right: ObjRef) : ObjRef
 /** Logical AND with short-circuit: a && b */
 class LogicalAndRef(private val left: ObjRef, private val right: ObjRef) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val a = left.evalValue(scope)
+        // Hoist flags to locals for JIT friendliness
+        val fastRval = PerfFlags.RVAL_FASTPATH
+        val fastPrim = PerfFlags.PRIMITIVE_FASTOPS
+        val a = if (fastRval) left.evalValue(scope) else left.get(scope).value
         if ((a as? ObjBool)?.value == false) return ObjFalse.asReadonly
-        val b = right.evalValue(scope)
+        val b = if (fastRval) right.evalValue(scope) else right.get(scope).value
-        if (PerfFlags.PRIMITIVE_FASTOPS) {
+        if (fastPrim) {
             if (a is ObjBool && b is ObjBool) {
                 return if (a.value && b.value) ObjTrue.asReadonly else ObjFalse.asReadonly
             }
@@ -439,9 +442,9 @@ class ConstRef(private val record: ObjRecord) : ObjRef {
  * Reference to an object's field with optional chaining.
  */
 class FieldRef(
-    val target: ObjRef,
+    private val target: ObjRef,
-    val name: String,
+    private val name: String,
-    val isOptional: Boolean,
+    private val isOptional: Boolean,
 ) : ObjRef {
     // 4-entry PIC for reads/writes (guarded by PerfFlags.FIELD_PIC)
     // Reads
@@ -502,9 +505,10 @@ class FieldRef(
     }
 
     override suspend fun get(scope: Scope): ObjRecord {
+        val fastRval = PerfFlags.RVAL_FASTPATH
         val fieldPic = PerfFlags.FIELD_PIC
         val picCounters = PerfFlags.PIC_DEBUG_COUNTERS
-        val base = target.evalValue(scope)
+        val base = if (fastRval) target.evalValue(scope) else target.get(scope).value
         if (base == ObjNull && isOptional) return ObjNull.asMutable
         if (fieldPic) {
             val (key, ver) = receiverKeyAndVersion(base)
@@ -591,7 +595,7 @@ class FieldRef(
                             val scope0 = (obj as ObjClass).classScope!!
                             val r0 = scope0.getSlotRecord(capturedIdx)
                             if (!r0.visibility.isPublic)
-                                sc.raiseError(ObjIllegalAccessException(sc, "can't access non-public field $name"))
+                                sc.raiseError(ObjAccessException(sc, "can't access non-public field $name"))
                             r0
                         }
                     } else {
@@ -627,7 +631,7 @@ class FieldRef(
                     // visibility/mutability checks
                     if (!rec.isMutable) scope.raiseError(ObjIllegalAssignmentException(scope, "can't reassign val $name"))
                     if (!rec.visibility.isPublic)
-                        scope.raiseError(ObjIllegalAccessException(scope, "can't access non-public field $name"))
+                        scope.raiseError(ObjAccessException(scope, "can't access non-public field $name"))
                     if (rec.value.assign(scope, newValue) == null) rec.value = newValue
                     return
                 }
@@ -796,10 +800,11 @@ class IndexRef(
         else -> 0L to -1
     }
     override suspend fun get(scope: Scope): ObjRecord {
-        val base = target.evalValue(scope)
+        val fastRval = PerfFlags.RVAL_FASTPATH
+        val base = if (fastRval) target.evalValue(scope) else target.get(scope).value
         if (base == ObjNull && isOptional) return ObjNull.asMutable
-        val idx = index.evalValue(scope)
+        val idx = if (fastRval) index.evalValue(scope) else index.get(scope).value
-        if (PerfFlags.RVAL_FASTPATH) {
+        if (fastRval) {
             // Primitive list index fast path: avoid virtual dispatch to getAt when shapes match
             if (base is ObjList && idx is ObjInt) {
                 val i = idx.toInt()
@@ -869,10 +874,11 @@ class IndexRef(
     }
 
     override suspend fun evalValue(scope: Scope): Obj {
-        val base = target.evalValue(scope)
+        val fastRval = PerfFlags.RVAL_FASTPATH
+        val base = if (fastRval) target.evalValue(scope) else target.get(scope).value
         if (base == ObjNull && isOptional) return ObjNull
-        val idx = index.evalValue(scope)
+        val idx = if (fastRval) index.evalValue(scope) else index.get(scope).value
-        if (PerfFlags.RVAL_FASTPATH) {
+        if (fastRval) {
             // Fast list[int] path
             if (base is ObjList && idx is ObjInt) {
                 val i = idx.toInt()
@@ -1021,8 +1027,9 @@ class CallRef(
     private val isOptionalInvoke: Boolean,
 ) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
+        val fastRval = PerfFlags.RVAL_FASTPATH
         val usePool = PerfFlags.SCOPE_POOL
-        val callee = target.evalValue(scope)
+        val callee = if (fastRval) target.evalValue(scope) else target.get(scope).value
         if (callee == ObjNull && isOptionalInvoke) return ObjNull.asReadonly
         val callArgs = args.toArguments(scope, tailBlock)
         val result: Obj = if (usePool) {
@@ -1110,9 +1117,10 @@ class MethodCallRef(
     }
 
     override suspend fun get(scope: Scope): ObjRecord {
+        val fastRval = PerfFlags.RVAL_FASTPATH
         val methodPic = PerfFlags.METHOD_PIC
         val picCounters = PerfFlags.PIC_DEBUG_COUNTERS
-        val base = receiver.evalValue(scope)
+        val base = if (fastRval) receiver.evalValue(scope) else receiver.get(scope).value
         if (base == ObjNull && isOptional) return ObjNull.asReadonly
         val callArgs = args.toArguments(scope, tailBlock)
         if (methodPic) {
@@ -1174,11 +1182,8 @@ class MethodCallRef(
                     var hierarchyMember: ObjRecord? = null
                     for (cls in base.objClass.mro) {
                         if (cls.className == "Obj") break
-                        val rec = cls.members[name] ?: cls.classScope?.objects?.get(name)
+                        hierarchyMember = cls.members[name] ?: cls.classScope?.objects?.get(name)
-                        if (rec != null && !rec.isAbstract && rec.type != ObjRecord.Type.Field) {
+                        if (hierarchyMember != null) break
-                            hierarchyMember = rec
-                            break
-                        }
                     }
 
                     if (hierarchyMember != null) {
@@ -1187,7 +1192,7 @@ class MethodCallRef(
                         mKey1 = key; mVer1 = ver; mInvoker1 = { obj, sc, a ->
                             val inst = obj as ObjInstance
                             if (!visibility.isPublic && !canAccessMember(visibility, hierarchyMember.declaringClass ?: inst.objClass, sc.currentClassCtx))
-                                sc.raiseError(ObjIllegalAccessException(sc, "can't invoke non-public method $name"))
+                                sc.raiseError(ObjAccessException(sc, "can't invoke non-public method $name"))
                             callable.invoke(inst.instanceScope, inst, a)
                         }
                     } else {
@@ -1319,21 +1324,21 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
     override suspend fun evalValue(scope: Scope): Obj {
         scope.pos = atPos
         if (!PerfFlags.LOCAL_SLOT_PIC) {
-            scope.getSlotIndexOf(name)?.let { return scope.resolve(scope.getSlotRecord(it), name) }
+            scope.getSlotIndexOf(name)?.let { return scope.getSlotRecord(it).value }
             // fallback to current-scope object or field on `this`
-            scope[name]?.let { return scope.resolve(it, name) }
+            scope[name]?.let { return it.value }
             run {
                 var s: Scope? = scope
                 val visited = HashSet<Long>(4)
                 while (s != null) {
                     if (!visited.add(s.frameId)) break
                     if (s is ClosureScope) {
-                        s.closureScope.chainLookupWithMembers(name)?.let { return s.resolve(it, name) }
+                        s.closureScope.chainLookupWithMembers(name)?.let { return it.value }
                     }
                     s = s.parent
                 }
             }
-            scope.chainLookupIgnoreClosure(name)?.let { return scope.resolve(it, name) }
+            scope.chainLookupIgnoreClosure(name)?.let { return it.value }
             return try {
                 scope.thisObj.readField(scope, name).value
             } catch (e: ExecutionError) {
@@ -1345,29 +1350,25 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
         val slot = if (hit) cachedSlot else resolveSlot(scope)
         if (slot >= 0) {
             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))
-                return scope.resolve(rec, name)
+                return rec.value
-            }
         }
         // Fallback name in scope or field on `this`
-        scope[name]?.let { 
+        scope[name]?.let { return it.value }
-            return scope.resolve(it, name) 
-        }
         run {
             var s: Scope? = scope
             val visited = HashSet<Long>(4)
             while (s != null) {
                 if (!visited.add(s.frameId)) break
                 if (s is ClosureScope) {
-                    s.closureScope.chainLookupWithMembers(name)?.let { return s.resolve(it, name) }
+                    s.closureScope.chainLookupWithMembers(name)?.let { return it.value }
                 }
                 s = s.parent
             }
         }
-        scope.chainLookupIgnoreClosure(name)?.let { return scope.resolve(it, name) }
+        scope.chainLookupIgnoreClosure(name)?.let { return it.value }
         return try {
-            val res = scope.thisObj.readField(scope, name).value
+            scope.thisObj.readField(scope, name).value
-            res
         } catch (e: ExecutionError) {
             if ((e.message ?: "").contains("no such field: $name")) scope.raiseSymbolNotFound(name)
             throw e
@@ -1379,11 +1380,13 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
         if (!PerfFlags.LOCAL_SLOT_PIC) {
             scope.getSlotIndexOf(name)?.let {
                 val rec = scope.getSlotRecord(it)
-                scope.assign(rec, name, newValue)
+                if (!rec.isMutable) scope.raiseError("Cannot assign to immutable value")
+                rec.value = newValue
                 return
             }
             scope[name]?.let { stored ->
-                scope.assign(stored, name, newValue)
+                if (stored.isMutable) stored.value = newValue
+                else scope.raiseError("Cannot assign to immutable value")
                 return
             }
             run {
@@ -1393,7 +1396,8 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
                     if (!visited.add(s.frameId)) break
                     if (s is ClosureScope) {
                         s.closureScope.chainLookupWithMembers(name)?.let { stored ->
-                            s.assign(stored, name, newValue)
+                            if (stored.isMutable) stored.value = newValue
+                            else scope.raiseError("Cannot assign to immutable value")
                             return
                         }
                     }
@@ -1401,7 +1405,8 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
                 }
             }
             scope.chainLookupIgnoreClosure(name)?.let { stored ->
-                scope.assign(stored, name, newValue)
+                if (stored.isMutable) stored.value = newValue
+                else scope.raiseError("Cannot assign to immutable value")
                 return
             }
             // Fallback: write to field on `this`
@@ -1412,12 +1417,14 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
         if (slot >= 0) {
             val rec = scope.getSlotRecord(slot)
             if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
-                scope.assign(rec, name, newValue)
+                if (!rec.isMutable) scope.raiseError("Cannot assign to immutable value")
+                rec.value = newValue
                 return
             }
         }
         scope[name]?.let { stored ->
-            scope.assign(stored, name, newValue)
+            if (stored.isMutable) stored.value = newValue
+            else scope.raiseError("Cannot assign to immutable value")
             return
         }
         run {
@@ -1427,7 +1434,8 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
                 if (!visited.add(s.frameId)) break
                 if (s is ClosureScope) {
                     s.closureScope.chainLookupWithMembers(name)?.let { stored ->
-                        s.assign(stored, name, newValue)
+                        if (stored.isMutable) stored.value = newValue
+                        else scope.raiseError("Cannot assign to immutable value")
                         return
                     }
                 }
@@ -1435,7 +1443,8 @@ class LocalVarRef(val name: String, private val atPos: Pos) : ObjRef {
             }
         }
         scope.chainLookupIgnoreClosure(name)?.let { stored ->
-            scope.assign(stored, name, newValue)
+            if (stored.isMutable) stored.value = newValue
+            else scope.raiseError("Cannot assign to immutable value")
             return
         }
         scope.thisObj.writeField(scope, name, newValue)
@@ -1455,7 +1464,7 @@ class BoundLocalVarRef(
         scope.pos = atPos
         val rec = scope.getSlotRecord(slot)
         if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx))
-            scope.raiseError(ObjIllegalAccessException(scope, "private field access"))
+            scope.raiseError(ObjAccessException(scope, "private field access"))
         return rec
     }
 
@@ -1463,19 +1472,17 @@ class BoundLocalVarRef(
         scope.pos = atPos
         val rec = scope.getSlotRecord(slot)
         if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx))
-            scope.raiseError(ObjIllegalAccessException(scope, "private field access"))
+            scope.raiseError(ObjAccessException(scope, "private field access"))
-        // We might not have the name in BoundLocalVarRef, but let's try to find it or use a placeholder
+        return rec.value
-        // Actually BoundLocalVarRef is mostly used for parameters which are not delegated yet.
-        // But for consistency:
-        return scope.resolve(rec, "local")
     }
 
     override suspend fun setAt(pos: Pos, scope: Scope, newValue: Obj) {
         scope.pos = atPos
         val rec = scope.getSlotRecord(slot)
         if (rec.declaringClass != null && !canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx))
-            scope.raiseError(ObjIllegalAccessException(scope, "private field access"))
+            scope.raiseError(ObjAccessException(scope, "private field access"))
-        scope.assign(rec, "local", newValue)
+        if (!rec.isMutable) scope.raiseError("Cannot assign to immutable value")
+        rec.value = newValue
     }
 }
 
@@ -1582,18 +1589,15 @@ class FastLocalVarRef(
         val actualOwner = cachedOwnerScope
         if (slot >= 0 && actualOwner != null) {
             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))
-                return actualOwner.resolve(rec, name)
+                return rec.value
-            }
         }
         // Try per-frame local binding maps in the ancestry first
         run {
             var s: Scope? = scope
             var guard = 0
             while (s != null) {
-                s.localBindings[name]?.let { 
+                s.localBindings[name]?.let { return it.value }
-                    return s.resolve(it, name) 
-                }
                 val next = s.parent
                 if (next === s) break
                 s = next
@@ -1605,9 +1609,7 @@ class FastLocalVarRef(
             var s: Scope? = scope
             var guard = 0
             while (s != null) {
-                s.objects[name]?.let { 
+                s.objects[name]?.let { return it.value }
-                    return s.resolve(it, name) 
-                }
                 val next = s.parent
                 if (next === s) break
                 s = next
@@ -1615,9 +1617,7 @@ class FastLocalVarRef(
             }
         }
         // Fallback to standard name lookup (locals or closure chain)
-        scope[name]?.let { 
+        scope[name]?.let { return it.value }
-            return scope.resolve(it, name) 
-        }
         return scope.thisObj.readField(scope, name).value
     }
 
@@ -1629,7 +1629,8 @@ class FastLocalVarRef(
         if (slot >= 0 && actualOwner != null) {
             val rec = actualOwner.getSlotRecord(slot)
             if (rec.declaringClass == null || canAccessMember(rec.visibility, rec.declaringClass, scope.currentClassCtx)) {
-                scope.assign(rec, name, newValue)
+                if (!rec.isMutable) scope.raiseError("Cannot assign to immutable value")
+                rec.value = newValue
                 return
             }
         }
@@ -1640,7 +1641,8 @@ class FastLocalVarRef(
             while (s != null) {
                 val rec = s.localBindings[name]
                 if (rec != null) {
-                    s.assign(rec, name, newValue)
+                    if (!rec.isMutable) scope.raiseError("Cannot assign to immutable value")
+                    rec.value = newValue
                     return
                 }
                 val next = s.parent
@@ -1651,7 +1653,8 @@ class FastLocalVarRef(
         }
         // Fallback to standard name lookup
         scope[name]?.let { stored ->
-            scope.assign(stored, name, newValue)
+            if (stored.isMutable) stored.value = newValue
+            else scope.raiseError("Cannot assign to immutable value")
             return
         }
         scope.thisObj.writeField(scope, name, newValue)
@@ -1685,11 +1688,11 @@ class ListLiteralRef(private val entries: List<ListEntry>) : ObjRef {
         for (e in entries) {
             when (e) {
                 is ListEntry.Element -> {
-                    val v = if (PerfFlags.RVAL_FASTPATH) e.ref.evalValue(scope) else e.ref.evalValue(scope)
+                    val v = if (PerfFlags.RVAL_FASTPATH) e.ref.evalValue(scope) else e.ref.get(scope).value
                     list += v
                 }
                 is ListEntry.Spread -> {
-                    val elements = e.ref.evalValue(scope)
+                    val elements = if (PerfFlags.RVAL_FASTPATH) e.ref.evalValue(scope) else e.ref.get(scope).value
                     when (elements) {
                         is ObjList -> {
                             // Grow underlying array once when possible
@@ -1765,11 +1768,11 @@ class MapLiteralRef(private val entries: List<MapLiteralEntry>) : ObjRef {
         for (e in entries) {
             when (e) {
                 is MapLiteralEntry.Named -> {
-                    val v = e.value.evalValue(scope)
+                    val v = if (PerfFlags.RVAL_FASTPATH) e.value.evalValue(scope) else e.value.get(scope).value
                     result.map[ObjString(e.key)] = v
                 }
                 is MapLiteralEntry.Spread -> {
-                    val m = e.ref.evalValue(scope)
+                    val m = if (PerfFlags.RVAL_FASTPATH) e.ref.evalValue(scope) else e.ref.get(scope).value
                     if (m !is ObjMap) scope.raiseIllegalArgument("spread element in map literal must be a Map")
                     for ((k, v) in m.map) {
                         result.map[k] = v
@@ -1790,8 +1793,8 @@ class RangeRef(
     private val isEndInclusive: Boolean
 ) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val l = left?.evalValue(scope) ?: ObjNull
+        val l = left?.let { if (PerfFlags.RVAL_FASTPATH) it.evalValue(scope) else it.get(scope).value } ?: ObjNull
-        val r = right?.evalValue(scope) ?: ObjNull
+        val r = right?.let { if (PerfFlags.RVAL_FASTPATH) it.evalValue(scope) else it.get(scope).value } ?: ObjNull
         return ObjRange(l, r, isEndInclusive = isEndInclusive).asReadonly
     }
 }
@@ -1803,7 +1806,7 @@ class AssignRef(
     private val atPos: Pos,
 ) : ObjRef {
     override suspend fun get(scope: Scope): ObjRecord {
-        val v = value.evalValue(scope)
+        val v = if (PerfFlags.RVAL_FASTPATH) value.evalValue(scope) else value.get(scope).value
         // For properties, we should not call get() on target because it invokes the getter.
         // Instead, we call setAt directly.
         if (target is FieldRef || target is IndexRef || target is LocalVarRef || target is FastLocalVarRef || target is BoundLocalVarRef) {

lynglib/src/commonMain/kotlin/net/sergeych/lyng/statements.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@ package net.sergeych.lyng
 
 import net.sergeych.lyng.obj.Obj
 import net.sergeych.lyng.obj.ObjClass
+import net.sergeych.lyng.obj.ObjNull
 import net.sergeych.lyng.obj.ObjVoid
 
 fun String.toSource(name: String = "eval"): Source = Source(name, this)
@@ -45,8 +46,9 @@ abstract class Statement(
     abstract suspend fun execute(scope: Scope): Obj
 
     override suspend fun compareTo(scope: Scope, other: Obj): Int {
+        if( other == ObjNull || other == ObjVoid ) return 1
         if( other === this ) return 0
-        return -3
+        return -1
     }
 
     override suspend fun callOn(scope: Scope): Obj {

lynglib/src/commonTest/kotlin/MIC3MroTest.kt

@@ -52,8 +52,8 @@ class MIC3MroTest {
         eval(
             """
             class A() { fun common() { "A" } }
-            class B() : A() { override fun common() { "B" } }
+            class B() : A() { fun common() { "B" } }
-            class C() : A() { override fun common() { "C" } }
+            class C() : A() { fun common() { "C" } }
             class D() : B(), C()
 
             val d = D()

lynglib/src/commonTest/kotlin/MiniAstTest.kt

@@ -115,23 +115,6 @@ class MiniAstTest {
         assertNotNull(vd.initRange)
     }
 
-    @Test
-    fun miniAst_captures_class_doc_with_members() = runTest {
-        val code = """
-            /** Class C docs */
-            class C {
-                fun foo() {}
-            }
-        """
-        val (_, sink) = compileWithMini(code)
-        val mini = sink.build()
-        assertNotNull(mini)
-        val cd = mini!!.declarations.filterIsInstance<MiniClassDecl>().firstOrNull { it.name == "C" }
-        assertNotNull(cd)
-        assertNotNull(cd.doc, "Class doc should be preserved even with members")
-        assertTrue(cd.doc!!.raw.contains("Class C docs"))
-    }
-
     @Test
     fun miniAst_captures_class_bases_and_doc() = runTest {
         val code = """

lynglib/src/commonTest/kotlin/OOTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -348,8 +348,7 @@ class OOTest {
     @Test
     fun testPropAsExtension() = runTest {
         val scope = Script.newScope()
-        scope.eval(
+        scope.eval("""
-            """
             class A(x) {
                 private val privateVal = 100
                 val p1 get() = x + 1
@@ -369,8 +368,7 @@ class OOTest {
              // it should also work with properties:
              val A.p10 get() = x * 10
              assertEquals(20, A(2).p10)
-        """.trimIndent()
+        """.trimIndent())
-        )
 
         // important is that such extensions should not be able to access private members
         // and thus remove privateness:
@@ -385,330 +383,17 @@ class OOTest {
     @Test
     fun testExtensionsAreScopeIsolated() = runTest {
         val scope1 = Script.newScope()
-        scope1.eval(
+        scope1.eval("""
-            """
             val String.totalDigits get() {
                 // notice using `this`:
                 this.characters.filter{ it.isDigit() }.size()
             }
             assertEquals(2, "answer is 42".totalDigits)
-        """
+        """)
-        )
         val scope2 = Script.newScope()
-        scope2.eval(
+        scope2.eval("""
-            """
             // in scope2 we didn't override `totalDigits` extension:
             assertThrows { "answer is 42".totalDigits }
-        """.trimIndent()
+        """.trimIndent())
-        )
-    }
-
-    @Test
-    fun testCacheInClass() = runTest {
-        eval(
-            """
-            class T(salt) {
-                private var c
-                 
-                init {
-                    println("create cached with "+salt)
-                    c = cached { salt + "." }
-                }
-                
-                fun getResult() = c()
-            }
-            
-            val t1 = T("foo")
-            val t2 = T("bar")
-            assertEquals("bar.", t2.getResult())
-            assertEquals("foo.", t1.getResult())
-            
-        """.trimIndent()
-        )
-    }
-
-    @Test
-    fun testLateInitValsInClasses() = runTest {
-        assertFails {
-            eval(
-                """
-                class T {
-                    val x
-                }
-            """
-            )
-        }
-
-        assertFails {
-            eval("val String.late")
-        }
-
-        eval(
-            """
-            // but we can "late-init" them in init block:
-            class OK {
-                val x
-                
-                init {
-                    x = "foo"
-                }
-            }
-            val ok = OK()
-            assertEquals("foo", ok.x)
-            
-            // they can't be reassigned:
-            assertThrows(IllegalAssignmentException) {
-                ok.x = "bar"
-            }
-            
-            // To test access before init, we need a trick:
-            class AccessBefore {
-                val x
-                fun readX() = x
-                init {
-                    assertEquals(x, Unset)
-                    // if we call readX() here, x is Unset. 
-                    // Just reading it is fine, but using it should throw:
-                    assertThrows(UnsetException) { readX() + 1 }
-                    x = 42
-                }
-            }
-            AccessBefore()
-        """.trimIndent()
-        )
-    }
-
-    @Test
-    fun testPrivateSet() = runTest {
-        eval(
-            """
-            class A {
-                var y = 100
-                    private set
-                fun setValue(newValue) { y = newValue }
-            }
-            assertEquals(100, A().y)
-            assertThrows(IllegalAccessException) { A().y = 200 }
-            val a = A()
-            a.setValue(200)
-            assertEquals(200, a.y)
-            
-            class B(initial) {
-                var y = initial
-                    protected set
-            }
-            class C(initial) : B(initial) {
-                fun setBValue(v) { y = v }
-            }
-            val c = C(10)
-            assertEquals(10, c.y)
-            assertThrows(IllegalAccessException) { c.y = 20 }
-            c.setBValue(30)
-            assertEquals(30, c.y)
-            
-            class D {
-                private var _y = 0
-                var y 
-                    get() = _y
-                    private set(v) { _y = v }
-                fun setY(v) { y = v }
-            }
-            val d = D()
-            assertEquals(0, d.y)
-            assertThrows(IllegalAccessException) { d.y = 10 }
-            d.setY(20)
-            assertEquals(20, d.y)
-        """
-        )
-    }
-
-    @Test
-    fun testValPrivateSetError() = runTest {
-        assertFails {
-            eval("class E { val x = 1 private set }")
-        }
-    }
-
-    @Test
-    fun testAbstractClassesAndOverridingProposal() = runTest {
-        val scope = Script.newScope()
-        /*
-            Abstract class is a sort of interface on steroidsL it is a class some members/methods of which
-            are required to be implemented by heirs. Still it is a regular class in all other respects.
-            Just can't be instantiated
-         */
-        scope.eval(
-            """
-            // abstract modifier is required. It can have a constructor, or be without it:    
-            abstract class A(someParam=1) {
-                // if the method is marked as abstract, it has no body:
-                abstract fun foo(): Int
-                
-                // abstract var/var have no initializer:
-                abstract var bar
-            }
-            // can't create instance of the abstract class:
-            assertThrows { A() }
-            """.trimIndent()
-        )
-        // create abstract method with body or val/var with initializer is an error:
-        assertFails { scope.eval("abstract class B { abstract fun foo() = 1 }") }
-        assertFails { scope.eval("abstract class C { abstract val bar = 1 }") }
-
-        // inheriting an abstract class without implementing all of it abstract members and methods
-        // is not allowed:
-        assertFails { scope.eval("class D : A(1) { override fun foo() = 10 }") }
-
-        // but it is allowed to inherit in another abstract class:
-        scope.eval("abstract class E : A(1) { override fun foo() = 10 }")
-
-        // implementing all abstracts let us have regular class:
-        scope.eval(
-            """
-            class F : E() {  override val bar = 11 }
-            assertEquals(10, F().foo())
-            assertEquals(11, F().bar)
-            """.trimIndent()
-        )
-
-        // Another possibility to override symbol is multiple inheritance: the parent that
-        // follows the abstract class in MI chain can override the abstract symbol:
-        scope.eval(
-            """
-            // This implementor know nothing of A but still implements de-facto its needs:
-            class Implementor {
-                val bar = 3
-                fun foo() = 1
-            }
-            
-            // now we can use MI to implement abstract class:
-            class F2 : A(42), Implementor 
-            
-            assertEquals(1, F2().foo())
-            assertEquals(3, F2().bar)
-            """
-        )
-    }
-
-    @Test
-    fun testAbstractAndOverrideEdgeCases() = runTest {
-        val scope = Script.newScope()
-
-        // 1. abstract private is an error:
-        assertFails { scope.eval("abstract class Err { abstract private fun foo() }") }
-        assertFails { scope.eval("abstract class Err { abstract private val x }") }
-
-        // 2. private member in parent is not visible for overriding:
-        scope.eval(
-            """
-            class Base {
-                private fun secret() = 1
-                fun callSecret() = secret()
-            }
-            class Derived : Base() {
-                // This is NOT an override, but a new method
-                fun secret() = 2
-            }
-            val d = Derived()
-            assertEquals(2, d.secret())
-            assertEquals(1, d.callSecret())
-            """.trimIndent()
-        )
-        // Using override keyword when there is only a private member in parent is an error:
-        assertFails { scope.eval("class D2 : Base() { override fun secret() = 3 }") }
-
-        // 3. interface can have state (constructor, fields, init):
-        scope.eval(
-            """
-            interface I(val x) {
-                var y = x * 2
-                val z
-                init {
-                    z = y + 1
-                }
-                fun foo() = x + y + z
-            }
-            class Impl : I(10)
-            val impl = Impl()
-            assertEquals(10, impl.x)
-            assertEquals(20, impl.y)
-            assertEquals(21, impl.z)
-            assertEquals(51, impl.foo())
-            """.trimIndent()
-        )
-
-        // 4. closed members cannot be overridden:
-        scope.eval(
-            """
-            class G {
-                closed fun locked() = "locked"
-                closed val permanent = 42
-            }
-            """.trimIndent()
-        )
-        assertFails { scope.eval("class H : G() { override fun locked() = \"free\" }") }
-        assertFails { scope.eval("class H : G() { override val permanent = 0 }") }
-        // Even without override keyword, it should fail if it's closed:
-        assertFails { scope.eval("class H : G() { fun locked() = \"free\" }") }
-
-        // 5. Visibility widening is allowed, narrowing is forbidden:
-        scope.eval(
-            """
-            class BaseVis {
-                protected fun prot() = 1
-            }
-            class Widened : BaseVis() {
-                override fun prot() = 2 // Widened to public (default)
-            }
-            assertEquals(2, Widened().prot())
-            
-            class BasePub {
-                fun pub() = 1
-            }
-            """.trimIndent()
-        )
-        // Narrowing:
-        assertFails { scope.eval("class Narrowed : BasePub() { override protected fun pub() = 2 }") }
-        assertFails { scope.eval("class Narrowed : BasePub() { override private fun pub() = 2 }") }
-    }
-
-    @Test
-    fun testInterfaceImplementationByParts() = runTest {
-        val scope = Script.newScope()
-        scope.eval(
-            """
-            // Interface with state (id) and abstract requirements
-            interface Character(val id) {
-                var health
-                var mana
-                fun isAlive() = health > 0
-                fun status() = name + " (#" + id + "): " + health + " HP, " + mana + " MP"
-                // name is also abstractly required by the status method, 
-                // even if not explicitly marked 'abstract val' here, 
-                // it will be looked up in MRO
-            }
-
-            // Part 1: Provides health
-            class HealthPool(var health)
-
-            // Part 2: Provides mana and name
-            class ManaPool(var mana) {
-                val name = "Hero"
-            }
-
-            // Composite class implementing Character by parts
-            class Warrior(id, h, m) : HealthPool(h), ManaPool(m), Character(id)
-
-            val w = Warrior(1, 100, 50)
-            assertEquals(100, w.health)
-            assertEquals(50, w.mana)
-            assertEquals(1, w.id)
-            assert(w.isAlive())
-            assertEquals("Hero (#1): 100 HP, 50 MP", w.status())
-
-            w.health = 0
-            assert(!w.isAlive())
-            """.trimIndent()
-        )
     }
 }

lynglib/src/commonTest/kotlin/ScriptTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -4532,32 +4532,4 @@ class ScriptTest {
         """.trimIndent())
     }
 
-//    @Test
-//    fun testUserClassExceptions() = runTest {
-//        eval("""
-//            val x = try { throw IllegalAccessException("test1") } catch { it }
-//            assertEquals("test1", x.message)
-//            assert( x is IllegalAccessException)
-//            assertThrows(IllegalAccessException) {   throw IllegalAccessException("test2") }
-//
-//            class X : Exception("test3")
-//            val y = try { throw X() } catch { it }
-//            println(y)
-//            assertEquals("test3", y.message)
-//            assert( y is X)
-//
-//        """.trimIndent())
-//    }
-
-    @Test
-    fun testTodo() = runTest {
-        eval("""
-            assertThrows(NotImplementedException) {
-                TODO()
-            }
-            val x = try { TODO("check me") } catch { it }
-            assertEquals("check me", x.message)
-        """.trimIndent())
-    }
-
 }

lynglib/src/commonTest/kotlin/net/sergeych/lyng/DelegationTest.kt

@@ -1,213 +0,0 @@
-/*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package net.sergeych.lyng
-
-import kotlinx.coroutines.test.runTest
-import kotlin.test.Test
-
-class DelegationTest {
-
-    @Test
-    fun testSimpleDelegation() = runTest {
-        eval("""
-            class Proxy() {
-                fun getValue(r, n) = 42
-            }
-            val x by Proxy()
-            assertEquals(42, x)
-        """)
-    }
-
-    @Test
-    fun testConstructorVal() = runTest {
-        eval("""
-            class Foo(val v) {
-                fun getV() = v
-            }
-            val f = Foo(42)
-            assertEquals(42, f.v)
-            assertEquals(42, f.getV())
-        """)
-    }
-
-    @Test
-    fun testBasicValVarDelegation() = runTest {
-        eval("""
-            class MapDelegate(val map) {
-                fun getValue(thisRef, name) = map[name]
-                fun setValue(thisRef, name, value) { map[name] = value }
-            }
-            
-            val data = { "x": 10 }
-            val x by MapDelegate(data)
-            var y by MapDelegate(data)
-            
-            assertEquals(10, x)
-            assertEquals(null, y)
-            y = 20
-            assertEquals(20, data["y"])
-            assertEquals(20, y)
-        """)
-    }
-
-    @Test
-    fun testClassDelegationWithThisRef() = runTest {
-        eval("""
-            class Proxy(val target) {
-                fun getValue(thisRef, name) = target[name]
-                fun setValue(thisRef, name, value) { target[name] = value }
-            }
-            
-            class User(initialName) {
-                val storage = { "name": initialName }
-                var name by Proxy(storage)
-            }
-            
-            val u = User("Alice")
-            assertEquals("Alice", u.name)
-            u.name = "Bob"
-            assertEquals("Bob", u.name)
-            assertEquals("Bob", u.storage["name"])
-        """)
-    }
-
-    @Test
-    fun testFunDelegation() = runTest {
-        eval("""
-            class ActionDelegate() {
-                fun invoke(thisRef, name, args...) {
-                    "Called %s with %d args: %s"(name, args.size, args.joinToString(","))
-                }
-            }
-            
-            fun greet by ActionDelegate()
-            
-            assertEquals("Called greet with 2 args: hello,world", greet("hello", "world"))
-        """)
-    }
-
-    @Test
-    fun testBindHook() = runTest {
-        eval("""
-            // Note: DelegateAccess might need to be defined or built-in
-            // For the test, let's assume it's passed as an integer or we define it
-            val VAL = 0
-            val VAR = 1
-            val CALLABLE = 2
-            
-            class OnlyVal() {
-                fun bind(name, access, thisRef) {
-                    if (access != VAL) throw "Only val allowed"
-                    this
-                }
-                fun getValue(thisRef, name) = 42
-            }
-            
-            val ok by OnlyVal()
-            assertEquals(42, ok)
-            
-            assertThrows {
-                eval("var bad by OnlyVal()")
-            }
-        """)
-    }
-
-    @Test
-    fun testStatelessObjectDelegate() = runTest {
-        eval("""
-            object Constant42 {
-                fun getValue(thisRef, name) = 42
-            }
-            
-            class Foo {
-                val a by Constant42
-                val b by Constant42
-            }
-            
-            val f = Foo()
-            assertEquals(42, f.a)
-            assertEquals(42, f.b)
-        """)
-    }
-
-    @Test
-    fun testLazyImplementation() = runTest {
-        eval("""
-            class Lazy(val creator) {
-                private var value = Unset
-                fun getValue(thisRef, name) {
-                    if (this.value == Unset) {
-                        this.value = creator()
-                    }
-                    this.value
-                }
-            }
-            fun lazy(creator) = Lazy(creator)
-            
-            var counter = 0
-            val x by lazy { counter++; "computed" }
-            
-            assertEquals(0, counter)
-            assertEquals("computed", x)
-            assertEquals(1, counter)
-            assertEquals("computed", x)
-            assertEquals(1, counter)
-        """)
-    }
-    
-    @Test
-    fun testLocalDelegation() = runTest {
-        eval("""
-            class LocalProxy(val v) {
-                fun getValue(thisRef, name) = v
-            }
-            
-            fun test() {
-                val x by LocalProxy(123)
-                x
-            }
-            
-            assertEquals(123, test())
-        """)
-    }
-
-    @Test
-    fun testStdlibLazy() = runTest {
-        eval("""
-            var counter = 0
-            val x by lazy { counter++; "computed" }
-            
-            assertEquals(0, counter)
-            assertEquals("computed", x)
-            assertEquals(1, counter)
-            assertEquals("computed", x)
-            
-            assertThrows {
-                eval("var y by lazy { 1 }")
-            }
-        """)
-    }
-
-    @Test
-    fun testLazyIsDelegate() = runTest {
-        eval("""
-            val l = lazy { 42 }
-            assert(l is Delegate)
-        """)
-    }
-}

lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/BlockReindentTest.kt

@@ -434,37 +434,4 @@ class BlockReindentTest {
         kotlin.test.assertTrue(lines.getOrNull(innerStart + 1)?.trimStart()?.startsWith("1") == true)
         kotlin.test.assertEquals("}", lines.getOrNull(innerStart + 2)?.trim())
     }
-    @Test
-    fun reindentRange_doubledIndentationFix() {
-        val src = """
-            class X {
-                fun funA(): String {
-                    "a"
-                }
-                fun runB() {
-                      }
-            }
-        """.trimIndent()
-
-        // The range for runB should be from the start of 'fun runB' line to the end of '}' line.
-        val startOfRunB = src.indexOf("    fun runB")
-        val endOfRunB = src.indexOf("          }") + "          }".length
-        val range = startOfRunB until endOfRunB
-
-        val cfg = LyngFormatConfig(indentSize = 4)
-        val updated = LyngFormatter.reindentRange(src, range, cfg, preserveBaseIndent = true)
-
-        val expected = """
-            class X {
-                fun funA(): String {
-                    "a"
-                }
-                fun runB() {
-                }
-            }
-        """.trimIndent()
-
-        assertEquals(expected, updated)
-    }
-
 }

lynglib/src/commonTest/kotlin/net/sergeych/lyng/format/LyngFormatterTest.kt

@@ -730,124 +730,4 @@ class LyngFormatterTest {
 
         assertEquals(expected, formatted)
     }
-
-    @Test
-    fun privateSet_indentation() {
-        val src = """
-            class A {
-                var x = 1
-                private set
-            }
-        """.trimIndent()
-
-        // What we expect: private set should be indented relative to the property
-        val expected = """
-            class A {
-                var x = 1
-                    private set
-            }
-        """.trimIndent()
-
-        val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
-        val out = LyngFormatter.reindent(src, cfg)
-        assertEquals(expected, out)
-    }
-
-    @Test
-    fun propertyAccessors_indentation() {
-        val src = """
-            class A {
-                var x
-                get() = 1
-                private set(v) {
-                _x = v
-                }
-            }
-        """.trimIndent()
-
-        val expected = """
-            class A {
-                var x
-                    get() = 1
-                    private set(v) {
-                        _x = v
-                    }
-            }
-        """.trimIndent()
-
-        val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
-        val out = LyngFormatter.reindent(src, cfg)
-        assertEquals(expected, out)
-    }
-
-    @Test
-    fun nestedAwaitingIndentation() {
-        val src = """
-            if (cond)
-            if (other)
-            fun f() {
-            stmt
-            }
-        """.trimIndent()
-
-        val expected = """
-            if (cond)
-                if (other)
-                    fun f() {
-                        stmt
-                    }
-        """.trimIndent()
-
-        val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
-        val out = LyngFormatter.reindent(src, cfg)
-        assertEquals(expected, out)
-    }
-
-    @Test
-    fun propertyAccessor_followedByMethod() {
-        val src = """
-            var state: BarRequestState get() = getState()
-                set(value) = setState(value)
-
-            fun save() { cell.value = this }
-        """.trimIndent()
-
-        val expected = """
-            var state: BarRequestState get() = getState()
-                set(value) = setState(value)
-
-            fun save() { cell.value = this }
-        """.trimIndent()
-
-        val cfg = LyngFormatConfig(indentSize = 4, continuationIndentSize = 4)
-        val out = LyngFormatter.reindent(src, cfg)
-        assertEquals(expected, out)
-    }
-
-    @Test
-    fun propertyAccessor_dangling() {
-        val src1 = """
-            var x
-                get()
-                = 1
-        """.trimIndent()
-        val expected1 = """
-            var x
-                get()
-                    = 1
-        """.trimIndent()
-        assertEquals(expected1, LyngFormatter.reindent(src1, LyngFormatConfig(indentSize = 4)))
-
-        val src2 = """
-            var x
-                get() =
-                1
-        """.trimIndent()
-        val expected2 = """
-            var x
-                get() =
-                    1
-        """.trimIndent()
-        assertEquals(expected2, LyngFormatter.reindent(src2, LyngFormatConfig(indentSize = 4)))
-    }
 }

lynglib/stdlib/lyng/root.lyng

@@ -276,56 +276,3 @@ fun Exception.printStackTrace() {
 /* Compile this string into a regular expression. */
 val String.re get() = Regex(this)
 
-fun TODO(message=null) = throw NotImplementedException(message ?: "not implemented")
-
-/* 
-Provides different access types for delegates.
-Used in the 'bind' hook to validate delegate usage.
-*/
-enum DelegateAccess {
-    Val,
-    Var,
-    Callable
-}
-
-/*
-Base interface for all delegates.
-Implementing this interface is optional as Lyng uses dynamic dispatch,
-but it is recommended for documentation and clarity.
-*/
-interface Delegate {
-    /* Called when a delegated 'val' or 'var' is read. */
-    fun getValue(thisRef, name) = TODO("delegate getter is not implemented")
-    
-    /* Called when a delegated 'var' is written. */
-    fun setValue(thisRef, name, newValue) = TODO("delegate setter is not implemented")
-    
-    /* Called when a delegated function is invoked. */
-    fun invoke(thisRef, name, args...) = TODO("delegate invoke is not implemented")
-    
-    /* 
-    Called once during initialization to configure or validate the delegate.
-    Should return the delegate object to be used (usually 'this').
-    */
-    fun bind(name, access, thisRef) = this
-}
-
-/*
-Standard implementation of a lazy-initialized property delegate.
-The provided creator lambda is called once on the first access to compute the value.
-Can only be used with 'val' properties.
-*/
-class lazy(creatorParam) : Delegate {
-    private val creator = creatorParam
-    private var value = Unset
-
-    override fun bind(name, access, thisRef) {
-        if (access != DelegateAccess.Val) throw "lazy delegate can only be used with 'val'"
-        this
-    }
-
-    override fun getValue(thisRef, name) {
-        if (value == Unset) value = creator()
-        value
-    }
-}

lyngweb/src/jsMain/kotlin/net/sergeych/lyngweb/Editor.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -318,21 +318,6 @@ fun EditorWithOverlay(
                     try { ta.setSelectionRange(res.selStart, res.selEnd) } catch (_: Throwable) {}
                     pendingSelStart = res.selStart
                     pendingSelEnd = res.selEnd
-                } else if (key.length == 1 && !ev.ctrlKey && !ev.metaKey && !ev.altKey) {
-                    // Handle single character input (like '}') for dedenting
-                    // This is an alternative to onInput to have better control
-                    val start = ta.selectionStart ?: 0
-                    val end = ta.selectionEnd ?: start
-                    val current = ta.value
-                    val res = applyChar(current, start, end, key[0], tabSize)
-                    if (res.text != (current.substring(0, start) + key + current.substring(end))) {
-                        // Logic decided to change something else (e.g. dedent)
-                        ev.preventDefault()
-                        setCode(res.text)
-                        try { ta.setSelectionRange(res.selStart, res.selEnd) } catch (_: Throwable) {}
-                        pendingSelStart = res.selStart
-                        pendingSelEnd = res.selEnd
-                    }
                 }
             }
 

lyngweb/src/jsMain/kotlin/net/sergeych/lyngweb/EditorLogic.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -83,6 +83,55 @@ private fun nextNonWs(text: String, idxInclusive: Int): Int {
 
 /** Apply Enter key behavior with smart indent/undent rules. */
 fun applyEnter(text: String, selStart: Int, selEnd: Int, tabSize: Int): EditResult {
+    // Global early rule (Rule 3): if the line after the current line is brace-only, dedent that line by one block and
+    // do NOT insert a newline. This uses precise line boundaries.
+    run {
+        val start = minOf(selStart, text.length)
+        val eol = lineEndAt(text, start)
+        val nextLineStart = if (eol < text.length && text[eol] == '\n') eol + 1 else eol
+        val nextLineEnd = lineEndAt(text, nextLineStart)
+        if (nextLineStart <= nextLineEnd && nextLineStart < text.length) {
+            val trimmedNext = text.substring(nextLineStart, nextLineEnd).trim()
+            if (trimmedNext == "}") {
+                val rbraceIndent = countIndentSpaces(text, nextLineStart, nextLineEnd)
+                val removeCount = kotlin.math.min(tabSize, rbraceIndent)
+                val crShift = if (nextLineStart < text.length && text[nextLineStart] == '\r') 1 else 0
+                val out = buildString(text.length) {
+                    append(safeSubstring(text, 0, nextLineStart))
+                    append(safeSubstring(text, nextLineStart + crShift + removeCount, text.length))
+                }
+                val caret = nextLineStart + kotlin.math.max(0, rbraceIndent - removeCount)
+                return EditResult(out, caret, caret)
+            }
+        }
+    }
+    // Absolute top-priority: caret is exactly at a line break and the next line is '}'-only (ignoring spaces).
+    // Dedent that next line by one block (tabSize) and do NOT insert a newline.
+    run {
+        if (selStart < text.length) {
+            val isCrLf = selStart + 1 < text.length && text[selStart] == '\r' && text[selStart + 1] == '\n'
+            val isLf = text[selStart] == '\n'
+            if (isCrLf || isLf) {
+                val nextLineStart = selStart + if (isCrLf) 2 else 1
+                val nextLineEnd = lineEndAt(text, nextLineStart)
+                if (nextLineStart <= nextLineEnd) {
+                    val trimmed = text.substring(nextLineStart, nextLineEnd).trim()
+                    if (trimmed == "}") {
+                        val rbraceIndent = countIndentSpaces(text, nextLineStart, nextLineEnd)
+                        val removeCount = kotlin.math.min(tabSize, rbraceIndent)
+                        val crShift = if (nextLineStart < text.length && text[nextLineStart] == '\r') 1 else 0
+                        val out = buildString(text.length) {
+                            append(safeSubstring(text, 0, nextLineStart))
+                            append(safeSubstring(text, nextLineStart + crShift + removeCount, text.length))
+                        }
+                        val caret = nextLineStart + kotlin.math.max(0, rbraceIndent - removeCount)
+                        return EditResult(out, caret, caret)
+                    }
+                }
+            }
+        }
+    }
+
     // If there is a selection, replace it by newline + current line indent
     if (selEnd != selStart) {
         val lineStart = lineStartAt(text, selStart)
@@ -99,6 +148,8 @@ fun applyEnter(text: String, selStart: Int, selEnd: Int, tabSize: Int): EditResu
     val lineEnd = lineEndAt(text, start)
     val indent = countIndentSpaces(text, lineStart, lineEnd)
 
+    // (Handled by the global early rule above; no need for additional EOL variants.)
+
     // Compute neighborhood characters early so rule precedence can use them
     val prevIdx = prevNonWs(text, start)
     val nextIdx = nextNonWs(text, start)
@@ -107,6 +158,85 @@ fun applyEnter(text: String, selStart: Int, selEnd: Int, tabSize: Int): EditResu
     val before = text.substring(0, start)
     val after = text.substring(start)
 
+    // Rule 2: On a brace-only line '}' (caret on the same line)
+    // If the current line’s trimmed text is exactly '}', decrease that line’s indent by one block (not below 0),
+    // then insert a newline. The newly inserted line uses the (decreased) indent. Place the caret at the start of
+    // the newly inserted line.
+    run {
+        val trimmed = text.substring(lineStart, lineEnd).trim()
+        // IMPORTANT: Rule precedence — do NOT trigger this rule when caret is after '}' and the rest of the line
+        // up to EOL contains only spaces (Rule 5 handles that case). That scenario must insert AFTER the brace,
+        // not before it.
+        var onlySpacesAfterCaret = true
+        var k = start
+        while (k < lineEnd) { if (text[k] != ' ') { onlySpacesAfterCaret = false; break }; k++ }
+        val rule5Situation = (prevCh == '}') && onlySpacesAfterCaret
+
+        if (trimmed == "}" && !rule5Situation) {
+            val removeCount = kotlin.math.min(tabSize, indent)
+            val newIndent = (indent - removeCount).coerceAtLeast(0)
+            val crShift = if (lineStart < text.length && text[lineStart] == '\r') 1 else 0
+            val out = buildString(text.length + 1 + newIndent) {
+                append(safeSubstring(text, 0, lineStart))
+                append("\n")
+                append(" ".repeat(newIndent))
+                // Write the brace line but with its indent reduced by removeCount spaces
+                append(safeSubstring(text, lineStart + crShift + removeCount, text.length))
+            }
+            val caret = lineStart + 1 + newIndent
+            return EditResult(out, caret, caret)
+        }
+    }
+
+    // (The special case of caret after the last non-ws on a '}'-only line is covered by the rule above.)
+
+    // 0) Caret is at end-of-line and the next line is a closing brace-only line: dedent that line, no extra newline
+    run {
+        val atCr = start + 1 < text.length && text[start] == '\r' && text[start + 1] == '\n'
+        val atNl = start < text.length && text[start] == '\n'
+        val atEol = atNl || atCr
+        if (atEol) {
+            val nlAdvance = if (atCr) 2 else 1
+            val nextLineStart = start + nlAdvance
+            val nextLineEnd = lineEndAt(text, nextLineStart)
+            val trimmedNext = text.substring(nextLineStart, nextLineEnd).trim()
+            if (trimmedNext == "}") {
+                val rbraceIndent = countIndentSpaces(text, nextLineStart, nextLineEnd)
+                // Dedent the '}' line by one block level (tabSize), but not below column 0
+                val removeCount = kotlin.math.min(tabSize, rbraceIndent)
+                val crShift = if (nextLineStart < text.length && text[nextLineStart] == '\r') 1 else 0
+                val out = buildString(text.length) {
+                    append(safeSubstring(text, 0, nextLineStart))
+                    append(safeSubstring(text, nextLineStart + crShift + removeCount, text.length))
+                }
+                val caret = start + nlAdvance + kotlin.math.max(0, rbraceIndent - removeCount)
+                return EditResult(out, caret, caret)
+            }
+        }
+    }
+
+    // 0b) If there is a newline at or after caret and the next line starts (ignoring spaces) with '}',
+    // dedent that '}' line without inserting an extra newline.
+    run {
+        val nlPos = text.indexOf('\n', start)
+        if (nlPos >= 0) {
+            val nextLineStart = nlPos + 1
+            val nextLineEnd = lineEndAt(text, nextLineStart)
+            val nextLineFirstNonWs = nextNonWs(text, nextLineStart)
+            if (nextLineFirstNonWs in nextLineStart until nextLineEnd && text[nextLineFirstNonWs] == '}') {
+                val rbraceIndent = countIndentSpaces(text, nextLineStart, nextLineEnd)
+                val removeCount = kotlin.math.min(tabSize, rbraceIndent)
+                val crShift = if (nextLineStart < text.length && text[nextLineStart] == '\r') 1 else 0
+                val out = buildString(text.length) {
+                    append(safeSubstring(text, 0, nextLineStart))
+                    append(safeSubstring(text, nextLineStart + crShift + removeCount, text.length))
+                }
+                val caret = nextLineStart + kotlin.math.max(0, rbraceIndent - removeCount)
+                return EditResult(out, caret, caret)
+            }
+        }
+    }
+
     // 1) Between braces { | } -> two lines, inner indented
     if (prevCh == '{' && nextCh == '}') {
         val innerIndent = indent + tabSize
@@ -124,17 +254,119 @@ fun applyEnter(text: String, selStart: Int, selEnd: Int, tabSize: Int): EditResu
     }
     // 3) Before '}'
     if (nextCh == '}') {
+        // We want two things:
+        //  - reduce indentation of the upcoming '}' line by one level
+        //  - avoid creating an extra blank line if caret is already at EOL (the next char is a newline)
+
+        // Compute where the '}' line starts and how many leading spaces it has
+        val rbraceLineStart = lineStartAt(text, nextIdx)
+        val rbraceLineEnd = lineEndAt(text, nextIdx)
+        val rbraceIndent = countIndentSpaces(text, rbraceLineStart, rbraceLineEnd)
+        // Dedent the '}' line by one block level (tabSize), but not below column 0
+        val removeCount = kotlin.math.min(tabSize, rbraceIndent)
+        val crShift = if (rbraceLineStart < text.length && text[rbraceLineStart] == '\r') 1 else 0
+
+        // If there is already a newline between caret and the '}', do NOT insert another newline.
+        // Just dedent the existing '}' line by one block and place caret at its start.
+        run {
+            val nlBetween = text.indexOf('\n', start)
+            if (nlBetween in start until rbraceLineStart) {
+                val out = buildString(text.length) {
+                    append(safeSubstring(text, 0, rbraceLineStart))
+                    append(safeSubstring(text, rbraceLineStart + crShift + removeCount, text.length))
+                }
+                val caret = rbraceLineStart + kotlin.math.max(0, rbraceIndent - removeCount)
+                return EditResult(out, caret, caret)
+            }
+        }
+
+        val hasNewlineAtCaret = (start < text.length && text[start] == '\n')
+
+        // New indentation for the line we create (if we actually insert one now)
+        val newLineIndent = (indent - tabSize).coerceAtLeast(0)
+        val insertion = if (hasNewlineAtCaret) "" else "\n" + " ".repeat(newLineIndent)
+
+        val out = buildString(text.length + insertion.length) {
+            append(before)
+            append(insertion)
+            // keep text up to the start of '}' line
+            append(safeSubstring(text, start, rbraceLineStart))
+            // drop up to tabSize spaces before '}'
+            append(safeSubstring(text, rbraceLineStart + crShift + removeCount, text.length))
+        }
+        val caret = if (hasNewlineAtCaret) {
+            // Caret moves to the beginning of the '}' line after dedent (right after the single newline)
+            start + 1 + kotlin.math.max(0, rbraceIndent - removeCount)
+        } else {
+            start + insertion.length
+        }
+        return EditResult(out, caret, caret)
+    }
+    // 4) After '}' with only trailing spaces before EOL
+    // According to Rule 5: if the last non-whitespace before the caret is '}' and
+    // only spaces remain until EOL, we must:
+    //  - dedent the current (brace) line by one block (not below 0)
+    //  - insert a newline just AFTER '}' (do NOT move caret backward)
+    //  - set the caret at the start of the newly inserted blank line, whose indent equals the dedented indent
+    if (prevCh == '}') {
+        var onlySpaces = true
+        var k = prevIdx + 1
+        while (k < lineEnd) { if (text[k] != ' ') { onlySpaces = false; break }; k++ }
+        if (onlySpaces) {
+            val removeCount = kotlin.math.min(tabSize, indent)
+            val newIndent = (indent - removeCount).coerceAtLeast(0)
+            val crShift = if (lineStart < text.length && text[lineStart] == '\r') 1 else 0
+
+            // Build the result:
+            //  - keep everything before the line start
+            //  - write the current line content up to the caret, but with its left indent reduced by removeCount
+            //  - insert newline + spaces(newIndent)
+            //  - drop trailing spaces after caret up to EOL
+            //  - keep the rest of the text starting from EOL
+            val out = buildString(text.length) {
+                append(safeSubstring(text, 0, lineStart))
+                append(safeSubstring(text, lineStart + crShift + removeCount, start))
+                append("\n")
+                append(" ".repeat(newIndent))
+                append(safeSubstring(text, lineEnd, text.length))
+            }
+            val caret = (lineStart + (start - (lineStart + crShift + removeCount)) + 1 + newIndent)
+            return EditResult(out, caret, caret)
+        } else {
+            // Default smart indent for cases where there are non-space characters after '}'
+            val insertion = "\n" + " ".repeat(indent)
+            val out = before + insertion + after
+            val caret = start + insertion.length
+            return EditResult(out, caret, caret)
+        }
+    }
+    // 5) Fallback: if there is a newline ahead and the next line, trimmed, equals '}', dedent that '}' line by one block
+    run {
+        val nlPos = text.indexOf('\n', start)
+        if (nlPos >= 0) {
+            val nextLineStart = nlPos + 1
+            val nextLineEnd = lineEndAt(text, nextLineStart)
+            val trimmedNext = text.substring(nextLineStart, nextLineEnd).trim()
+            if (trimmedNext == "}") {
+                val rbraceIndent = countIndentSpaces(text, nextLineStart, nextLineEnd)
+                val removeCount = kotlin.math.min(tabSize, rbraceIndent)
+                val crShift = if (nextLineStart < text.length && text[nextLineStart] == '\r') 1 else 0
+                val out = buildString(text.length) {
+                    append(safeSubstring(text, 0, nextLineStart))
+                    append(safeSubstring(text, nextLineStart + crShift + removeCount, text.length))
+                }
+                val caret = nextLineStart + kotlin.math.max(0, rbraceIndent - removeCount)
+                return EditResult(out, caret, caret)
+            }
+        }
+    }
+    // default keep same indent
+    run {
         val insertion = "\n" + " ".repeat(indent)
         val out = before + insertion + after
         val caret = start + insertion.length
         return EditResult(out, caret, caret)
     }
-
-    // default keep same indent
-    val insertion = "\n" + " ".repeat(indent)
-    val out = before + insertion + after
-    val caret = start + insertion.length
-    return EditResult(out, caret, caret)
 }
 
 /** Apply Tab key: insert spaces at caret (single-caret only). */
@@ -191,37 +423,3 @@ fun applyShiftTab(text: String, selStart: Int, selEnd: Int, tabSize: Int): EditR
     val e = maxOf(newSelStart, newSelEnd)
     return EditResult(sb.toString(), s, e)
 }
-
-/**
- * Apply a typed character. If the character is '}', and it's the only non-whitespace on the line,
- * it may be dedented.
- */
-fun applyChar(text: String, selStart: Int, selEnd: Int, ch: Char, tabSize: Int): EditResult {
-    // Selection replacement
-    val current = if (selStart != selEnd) {
-        text.substring(0, minOf(selStart, selEnd)) + text.substring(maxOf(selStart, selEnd))
-    } else text
-    val pos = minOf(selStart, selEnd)
-
-    val before = current.substring(0, pos)
-    val after = current.substring(pos)
-    val newText = before + ch + after
-    val newPos = pos + 1
-
-    if (ch == '}') {
-        val lineStart = lineStartAt(newText, pos)
-        val lineEnd = lineEndAt(newText, newPos)
-        val trimmed = newText.substring(lineStart, lineEnd).trim()
-        if (trimmed == "}") {
-            // Dedent this line
-            val indent = countIndentSpaces(newText, lineStart, lineEnd)
-            val removeCount = minOf(tabSize, indent)
-            if (removeCount > 0) {
-                val out = newText.substring(0, lineStart) + newText.substring(lineStart + removeCount)
-                return EditResult(out, newPos - removeCount, newPos - removeCount)
-            }
-        }
-    }
-
-    return EditResult(newText, newPos, newPos)
-}

lyngweb/src/jsMain/kotlin/net/sergeych/lyngweb/Highlight.kt

@@ -28,7 +28,10 @@ import net.sergeych.lyng.binding.SymbolKind
 import net.sergeych.lyng.highlight.HighlightKind
 import net.sergeych.lyng.highlight.SimpleLyngHighlighter
 import net.sergeych.lyng.highlight.offsetOf
-import net.sergeych.lyng.miniast.*
+import net.sergeych.lyng.miniast.MiniAstBuilder
+import net.sergeych.lyng.miniast.MiniClassDecl
+import net.sergeych.lyng.miniast.MiniFunDecl
+import net.sergeych.lyng.miniast.MiniTypeName
 import org.w3c.dom.HTMLStyleElement
 
 fun ensureBootstrapCodeBlocks(html: String): String {
@@ -363,8 +366,8 @@ suspend fun applyLyngHighlightToTextAst(text: String): String {
             when (d) {
                 is MiniFunDecl -> putName(d.nameStart, d.name, "hl-fn")
                 is MiniClassDecl -> putName(d.nameStart, d.name, "hl-class")
+                is net.sergeych.lyng.miniast.MiniEnumDecl -> putName(d.nameStart, d.name, "hl-class")
                 is net.sergeych.lyng.miniast.MiniValDecl -> putName(d.nameStart, d.name, if (d.mutable) "hl-var" else "hl-val")
-                is MiniEnumDecl -> putName(d.nameStart, d.name, "hl-class")
             }
         }
         // Imports: color each segment as directive/path
@@ -402,7 +405,7 @@ suspend fun applyLyngHighlightToTextAst(text: String): String {
                 }
                 is net.sergeych.lyng.miniast.MiniValDecl -> addTypeSegments(d.type)
                 is MiniClassDecl -> {}
-                is MiniEnumDecl -> {}
+                is net.sergeych.lyng.miniast.MiniEnumDecl -> {}
             }
         }
 
@@ -530,11 +533,10 @@ private fun detectDeclarationAndParamOverrides(text: String): Map<Pair<Int, Int>
     fun isIdentPart(ch: Char) = ch == '_' || ch == '$' || ch == '~' || ch.isLetterOrDigit()
     // A conservative list of language keywords to avoid misclassifying as function calls
     val kw = setOf(
-        "package", "import", "fun", "fn", "class", "interface", "enum", "val", "var",
+        "package", "import", "fun", "fn", "class", "enum", "val", "var",
         "if", "else", "while", "do", "for", "when", "try", "catch", "finally",
         "throw", "return", "break", "continue", "in", "is", "as", "as?", "not",
-        "true", "false", "null", "private", "protected", "abstract", "closed", "override", "open", "extern", "static",
+        "true", "false", "null", "private", "protected", "open", "extern", "static"
-        "init", "get", "set", "Unset", "by"
     )
     fun skipWs(idx0: Int): Int {
         var idx = idx0

lyngweb/src/jsTest/kotlin/EditorLogicTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,19 +25,81 @@ class EditorLogicTest {
     private val tab = 4
 
     @Test
-    fun type_rbrace_dedents_if_only_char_on_line() {
+    fun enter_after_only_rbrace_undents() {
-        val text = "    "
+        val line = "    }   " // 4 spaces, brace, trailing spaces; caret after last non-ws
-        val res = applyChar(text, 4, 4, '}', tab)
+        val res = applyEnter(line, line.length, line.length, tab)
-        assertEquals("}", res.text)
+        // Should insert newline with one indent level less (0 spaces here)
-        assertEquals(1, res.selStart)
+        assertEquals("    }   \n" + "" , res.text.substring(0, res.text.indexOf('\n')+1))
+        // After insertion caret should be at end of inserted indentation
+        // Here indent was 4 and undented by 4 -> 0 spaces after newline
+        val expectedCaret = line.length + 1 + 0
+        assertEquals(expectedCaret, res.selStart)
+        assertEquals(expectedCaret, res.selEnd)
     }
 
     @Test
-    fun type_rbrace_no_dedent_if_not_only_char() {
+    fun enter_after_rbrace_with_only_spaces_to_eol_inserts_after_brace_and_dedents_and_undents_brace_line() {
-        val text = "    foo "
+        // Rule 5 exact check: last non-ws before caret is '}', remainder to EOL only spaces
-        val res = applyChar(text, 8, 8, '}', tab)
+        val indents = listOf(0, 4, 8)
-        assertEquals("    foo }", res.text)
+        for (indent in indents) {
-        assertEquals(9, res.selStart)
+            val spaces = " ".repeat(indent)
+            // Line ends with '}' followed by three spaces
+            val before = (
+                """
+                1
+                ${'$'}spaces}
+                """
+            ).trimIndent() + "   "
+            // Caret right after '}', before trailing spaces
+            val caret = before.indexOf('}') + 1
+            val res = applyEnter(before, caret, caret, tab)
+
+            val newBraceIndent = (indent - tab).coerceAtLeast(0)
+            val newLineIndent = newBraceIndent
+            val expected = buildString {
+                append("1\n")
+                append(" ".repeat(newBraceIndent))
+                append("}\n")
+                append(" ".repeat(newLineIndent))
+            }
+            assertEquals(expected, res.text)
+            // Caret must be at start of the newly inserted line (after the final newline)
+            assertEquals(expected.length, res.selStart)
+            assertEquals(res.selStart, res.selEnd)
+        }
+    }
+
+    @Test
+    fun enter_after_rbrace_with_only_spaces_to_eol_crlf_and_undents_brace_line() {
+        val indent = 4
+        val spaces = " ".repeat(indent)
+        val beforeLf = (
+            """
+            1
+            ${'$'}spaces}
+            """
+        ).trimIndent() + "   "
+        val before = beforeLf.replace("\n", "\r\n")
+        val caret = before.indexOf('}') + 1
+        val res = applyEnter(before, caret, caret, tab)
+        val actual = res.text.replace("\r\n", "\n")
+        val newIndent = (indent - tab).coerceAtLeast(0)
+        val expected = "1\n${" ".repeat(newIndent)}}\n${" ".repeat(newIndent)}"
+        assertEquals(expected, actual)
+        assertEquals(expected.length, res.selStart)
+        assertEquals(res.selStart, res.selEnd)
+    }
+
+    @Test
+    fun enter_before_closing_brace_outdents() {
+        val text = "    }" // caret before '}' at index 4
+        val caret = 4
+        val res = applyEnter(text, caret, caret, tab)
+        // Inserted a newline with indent reduced to 0
+        assertEquals("\n" + "" + "}", res.text.substring(caret, caret + 2))
+        val expectedCaret = caret + 1 + 0
+        assertEquals(expectedCaret, res.selStart)
+        assertEquals(expectedCaret, res.selEnd)
     }
 
     @Test
@@ -61,6 +123,23 @@ class EditorLogicTest {
         assertEquals(1 + 1 + 4, res.selStart)
     }
 
+    @Test
+    fun enter_after_rbrace_line_undents_ignoring_trailing_ws() {
+        // Line contains only '}' plus trailing spaces; caret after last non-ws
+        val line = "    }   "
+        val res = applyEnter(line, line.length, line.length, tab)
+        // Expect insertion of a newline and an undented indentation of (indent - tab)
+        val expectedIndentAfterNewline = 0 // 4 - 4
+        val expected = line + "\n" + " ".repeat(expectedIndentAfterNewline)
+        // Compare prefix up to inserted indentation
+        val prefix = res.text.substring(0, expected.length)
+        assertEquals(expected, prefix)
+        // Caret positioned at end of inserted indentation
+        val expectedCaret = expected.length
+        assertEquals(expectedCaret, res.selStart)
+        assertEquals(expectedCaret, res.selEnd)
+    }
+
     @Test
     fun shift_tab_outdents_rbrace_only_line_no_newline() {
         // Multi-line: a block followed by a number; we outdent the '}' line only
@@ -92,55 +171,222 @@ class EditorLogicTest {
         assertEquals(1 + 4, res.selStart)
     }
 
-    /*
     @Test
     fun enter_before_line_with_only_rbrace_dedents_that_line() {
-    ...
+        // Initial content as reported by user before fix
-    */
+        val before = (
+            """
+            {
+                1
+                2
+                3
+                }
+            1
+            2
+            3
+            """
+        ).trimIndent()
+
+        // Place caret at the end of the line that contains just "    3" (before the line with '}')
+        val lines = before.split('\n')
+        // Build index of end of the line with the last "    3"
+        var idx = 0
+        var caret = 0
+        for (i in lines.indices) {
+            val line = lines[i]
+            if (line.trimEnd() == "3" && i + 1 < lines.size && lines[i + 1].trim() == "}") {
+                caret = idx + line.length // position after '3', before the newline
+                break
+            }
+            idx += line.length + 1 // +1 for newline
+        }
+
+        val res = applyEnter(before, caret, caret, tab)
+
+        val expected = (
+            """
+            {
+                1
+                2
+                3
+            }
+            1
+            2
+            3
+            """
+        ).trimIndent()
+
+        assertEquals(expected, res.text)
+    }
 
-    /*
     @Test
     fun enter_eol_before_brace_only_next_line_various_indents() {
-    ...
+        // Cover Rule 3 with LF newlines, at indents 0, 2, 4, 8
-    */
+        val indents = listOf(0, 2, 4, 8)
+        for (indent in indents) {
+            val spaces = " ".repeat(indent)
+            val before = (
+                """
+                1
+                2
+                3
+                ${'$'}spaces}
+                4
+                """
+            ).trimIndent()
+            // Caret at end of the line with '3' (line before the rbrace-only line)
+            val caret = before.indexOf("3\n") + 1 // just before LF
+            val res = applyEnter(before, caret, caret, tab)
+
+            // The '}' line must be dedented by one block (clamped at 0) and caret moved to its start
+            val expectedIndent = (indent - tab).coerceAtLeast(0)
+            val expected = (
+                """
+                1
+                2
+                3
+                ${'$'}{" ".repeat(expectedIndent)}}
+                4
+                """
+            ).trimIndent()
+            assertEquals(expected, res.text, "EOL before '}' dedent failed for indent=${'$'}indent")
+            // Caret should be at start of that '}' line (line index 3)
+            val lines = res.text.split('\n')
+            var pos = 0
+            for (i in 0 until 3) pos += lines[i].length + 1
+            assertEquals(pos, res.selStart, "Caret pos mismatch for indent=${'$'}indent")
+            assertEquals(pos, res.selEnd, "Caret pos mismatch for indent=${'$'}indent")
+        }
+    }
 
-    /*
     @Test
     fun enter_eol_before_brace_only_next_line_various_indents_crlf() {
-    ...
+        // Same as above but with CRLF newlines
-    */
+        val indents = listOf(0, 2, 4, 8)
+        for (indent in indents) {
+            val spaces = " ".repeat(indent)
+            val beforeLf = (
+                """
+                1
+                2
+                3
+                ${'$'}spaces}
+                4
+                """
+            ).trimIndent()
+            val before = beforeLf.replace("\n", "\r\n")
+            val caret = before.indexOf("3\r\n") + 1 // at '3' index + 1 moves to end-of-line before CR
+            val res = applyEnter(before, caret, caret, tab)
+
+            val expectedIndent = (indent - tab).coerceAtLeast(0)
+            val expectedLf = (
+                """
+                1
+                2
+                3
+                ${'$'}{" ".repeat(expectedIndent)}}
+                4
+                """
+            ).trimIndent()
+            assertEquals(expectedLf, res.text.replace("\r\n", "\n"), "CRLF case failed for indent=${'$'}indent")
+        }
+    }
 
-    /*
     @Test
     fun enter_at_start_of_brace_only_line_at_cols_0_2_4() {
-    ...
+        val indents = listOf(0, 2, 4)
-    */
+        for (indent in indents) {
+            val spaces = " ".repeat(indent)
+            val before = (
+                """
+                1
+                2
+                ${'$'}spaces}
+                3
+                """
+            ).trimIndent()
+            // Caret at start of the brace line
+            val lines = before.split('\n')
+            var caret = 0
+            for (i in 0 until 2) caret += lines[i].length + 1
+            caret += 0 // column 0 of brace line
+            val res = applyEnter(before, caret, caret, tab)
+
+            // Expect the brace line to be dedented by one block, and a new line inserted before it
+            val expectedIndent = (indent - tab).coerceAtLeast(0)
+            val expected = (
+                """
+                1
+                2
+                ${'$'}{" ".repeat(expectedIndent)}
+                ${'$'}{" ".repeat(expectedIndent)}}
+                3
+                """
+            ).trimIndent()
+            assertEquals(expected, res.text, "Brace-line start enter failed for indent=${'$'}indent")
+            // Caret must be at start of the inserted line, which has expectedIndent spaces
+            val afterLines = res.text.split('\n')
+            var pos = 0
+            for (i in 0 until 3) pos += afterLines[i].length + 1
+            // The inserted line is line index 2 (0-based), caret at its start
+            pos -= afterLines[2].length + 1
+            pos += 0
+            assertEquals(pos, res.selStart, "Caret mismatch for indent=${'$'}indent")
+            assertEquals(pos, res.selEnd, "Caret mismatch for indent=${'$'}indent")
+        }
+    }
 
     @Test
     fun enter_on_whitespace_only_line_keeps_same_indent() {
         val before = "    \nnext" // line 0 has 4 spaces only
-        val caret = 4 // at end of spaces, before LF
+        val caret = 0 + 4 // at end of spaces, before LF
         val res = applyEnter(before, caret, caret, tab)
         // Default smart indent should keep indent = 4
-        // Original text: '    ' + '\n' + 'next'
-        // Inserted: '\n' + '    ' at caret 4
-        // Result: '    ' + '\n' + '    ' + '\n' + 'next'
         assertEquals("    \n    \nnext", res.text)
-        // Caret at start of the new blank line with 4 spaces (after first newline)
+        // Caret at start of the new blank line with 4 spaces
-        // lineStart(0) + indent(4) + newline(1) + newIndent(4) = 9
+        assertEquals(1 + 4, res.selStart)
-        assertEquals(4 + 1 + 4, res.selStart)
         assertEquals(res.selStart, res.selEnd)
     }
 
-    /*
     @Test
     fun enter_on_line_with_rbrace_else_lbrace_defaults_smart() {
-    ...
+        val text = "    } else {"
-    */
+        // Try caret positions after '}', before 'e', and after '{'
+        val carets = listOf(5, 6, text.length)
+        for (c in carets) {
+            val res = applyEnter(text, c, c, tab)
+            // Should not trigger special cases since line is not brace-only or only-spaces after '}'
+            // Expect same indent (4 spaces)
+            val expectedPrefix = text.substring(0, c) + "\n" + " ".repeat(4)
+            assertEquals(expectedPrefix, res.text.substring(0, expectedPrefix.length))
+            assertEquals(c + 1 + 4, res.selStart)
+            assertEquals(res.selStart, res.selEnd)
+        }
+    }
 
-    /*
     @Test
     fun enter_with_selection_replaces_and_uses_anchor_indent() {
-    ...
+        val text = (
-    */
+            """
+            1
+                2
+            3
+            """
+        ).trimIndent()
+        // Select "2\n3" starting at column 4 of line 1 (indent = 4)
+        val idxLine0 = text.indexOf('1')
+        val idxLine1 = text.indexOf('\n', idxLine0) + 1
+        val selStart = idxLine1 + 4 // after 4 spaces
+        val selEnd = text.length
+        val res = applyEnter(text, selStart, selEnd, tab)
+        val expected = (
+            """
+            1
+                
+            """
+        ).trimIndent()
+        assertEquals(expected, res.text)
+        assertEquals(expected.length, res.selStart)
+        assertEquals(res.selStart, res.selEnd)
+    }
 }

site/src/jsMain/kotlin/App.kt

@@ -28,7 +28,6 @@ fun App() {
     var toc by remember { mutableStateOf<List<TocItem>>(emptyList()) }
     var activeTocId by remember { mutableStateOf<String?>(null) }
     var contentEl by remember { mutableStateOf<HTMLElement?>(null) }
-    var navEl by remember { mutableStateOf<HTMLElement?>(null) }
     val isDocsRoute = route.startsWith("docs/")
     val docKey = stripFragment(route)
 
@@ -61,13 +60,6 @@ fun App() {
         onDispose { window.removeEventListener("hashchange", listener) }
     }
 
-    LaunchedEffect(activeTocId) {
-        val activeId = activeTocId ?: return@LaunchedEffect
-        val nav = navEl ?: return@LaunchedEffect
-        val activeLink = nav.querySelector("a[data-toc-id=\"$activeId\"]") as? HTMLElement
-        activeLink?.scrollIntoView(js("({block: 'nearest', behavior: 'smooth'})"))
-    }
-
     PageTemplate(title = when {
         isDocsRoute -> null
         route.startsWith("reference") -> "Reference"
@@ -79,11 +71,7 @@ fun App() {
                 Div({ classes("col-12", "col-lg-3") }) {
                     Nav({
                         classes("position-sticky")
-                        attr("style", "top: calc(var(--navbar-offset) + 1rem); max-height: calc(100vh - var(--navbar-offset) - 2rem); overflow-y: auto;")
+                        attr("style", "top: calc(var(--navbar-offset) + 1rem)")
-                        ref {
-                            navEl = it
-                            onDispose { navEl = null }
-                        }
                     }) {
                         H2({ classes("h6", "text-uppercase", "text-muted") }) { Text("On this page") }
                         Ul({ classes("list-unstyled") }) {
@@ -94,7 +82,6 @@ fun App() {
                                     val tocHref = "#/$routeNoFrag#${item.id}"
                                     A(attrs = {
                                         attr("href", tocHref)
-                                        attr("data-toc-id", item.id)
                                         attr("style", "padding-left: $pad")
                                         classes("link-body-emphasis", "text-decoration-none")
                                         if (activeTocId == item.id) {

site/src/jsMain/kotlin/Main.kt

@@ -180,17 +180,6 @@ fun ensureDocsLayoutStyles() {
                 .markdown-body h1:first-child {
                   margin-top: 0 !important;
                 }
-                /* Hide scrollbar for the TOC nav but allow scrolling */
-                nav.position-sticky::-webkit-scrollbar {
-                  width: 4px;
-                }
-                nav.position-sticky::-webkit-scrollbar-thumb {
-                  background: rgba(128,128,128,0.2);
-                  border-radius: 4px;
-                }
-                nav.position-sticky:hover::-webkit-scrollbar-thumb {
-                  background: rgba(128,128,128,0.5);
-                }
                 """
                 .trimIndent()
             )

site/src/jsMain/kotlin/ReferencePage.kt

@@ -151,15 +151,8 @@ fun ReferencePage() {
                                 }
                             }
                             is MiniEnumDecl -> {
-                                Div { Text("enum ${d.name}") }
+                                Div { Text("enum ${d.name} { ${d.entries.joinToString(", ")} }") }
                                 d.doc?.summary?.let { Small({ classes("text-muted") }) { Text(it) } }
-                                if (d.entries.isNotEmpty()) {
-                                    Ul({ classes("mt-2") }) {
-                                        d.entries.forEach { entry ->
-                                            Li { Text(entry) }
-                                        }
-                                    }
-                                }
                             }
                         }
                     }

site/src/jsMain/resources/index.html

@@ -1,5 +1,5 @@
 <!--
-  ~ Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+  ~ Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
   ~
   ~ Licensed under the Apache License, Version 2.0 (the "License");
   ~ you may not use this file except in compliance with the License.
@@ -329,7 +329,7 @@
 <!-- Top-left version ribbon -->
 <div class="corner-ribbon bg-danger text-white">
         <span style="margin-left: -5em">
-            v1.1.0-rc
+            v1.1.0-beta2
         </span>
 </div>
 <!-- Fixed top navbar for the whole site -->

site/src/jsTest/kotlin/HighlightSmokeTest.kt

@@ -1,5 +1,5 @@
 /*
- * Copyright 2026 Sergey S. Chernov real.sergeych@gmail.com
+ * Copyright 2025 Sergey S. Chernov real.sergeych@gmail.com
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -60,7 +60,7 @@ class HighlightSmokeTest {
         // Spread operator present
         assertContains(html, "<span class=\"hl-op\">...</span>")
         // String key and identifier key appear
-        assertContains(html, "<span class=\"hl-str\">&quot;a&quot;</span>")
+        assertContains(html, "<span class=\"hl-str\">\"a\"</span>")
         assertContains(html, "<span class=\"hl-id\">b</span>")
     }