Merge pull request from ok2/perf/typed-calls

0.2.7: typed calling convention, per-region and BEGIN loop promotion, and a fix for a promoted loop/IF that reordered the stack.
release: 0.2.7
2026-08-09 17:53:00 +02:00 · 2026-08-09 17:36:52 +02:00 · 2026-08-09 17:25:21 +02:00 · 2026-08-09 09:20:10 +02:00 · 2026-08-07 13:11:50 +02:00 · 2026-08-07 13:10:42 +02:00
32 changed files with 5748 additions and 1072 deletions
@@ -3,3 +3,6 @@
 *.swp
 .DS_Store
 *.bk
 # Local planning notes — never tracked
 /plans/
@@ -0,0 +1,346 @@
 # Changelog
 All notable changes to WAFER are documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 ## [0.2.7] - 2026-08-09
 ### Added
 - **A typed calling convention for words with a known stack effect.** Such a
  word now compiles to two entry points: a fast one whose signature is
  `(i32 x p) -> (i32 x q)`, carrying its stack items as WASM values, and the
  usual `( -- )` wrapper that moves those items on and off the memory data
  stack. The wrapper keeps the function-table slot, so `EXECUTE`, the outer
  interpreter, host words and `CATCH` see exactly the ABI they saw before;
  only direct calls inside a module take the fast entry.
  This is what the SwiftForth gap was made of. sf64 keeps TOS in `RBX` and
  the stack pointer in `RBP`, and both survive a `CALL` untouched, so its
  `FIB` is 16 instructions and ~7 memory touches per node. WAFER kept the
  whole stack in linear memory and flushed its cached `$dsp` to an imported
  global before every call: ~36 memory touches per node. The stack simulator
  that already promoted loop and `IF` bodies into WASM locals refused any
  body containing a call or an `EXIT` -- exactly the words where the
  convention cost the most. It now handles both.
  Fibonacci(25) goes from 1035 to 366 µs, 4.3x slower than `sf64` to 1.2x.
  Loop-heavy benchmarks are unchanged by this entry — see the region
  promotion below for those. Words that keep the memory convention: anything
  using `SP@`, `DEPTH`, `EXECUTE`, `>R`/`R>`, floats or locals; anything
  calling a word that is itself untyped, which in the JIT path means every
  call except `RECURSE`; mutually recursive words; and words whose effect is
  not static -- branches that disagree on depth, `EXIT` at the wrong depth,
  a non-neutral loop body, or a recursion that grows the stack per level.
  `CONSOLIDATE` extends this across words, since it puts them all in one
  module: the effects are solved to a fixpoint from the leaves outward, and
  105 of 187 words in a booted dictionary end up typed.
  Stack guards get cheap as a side effect -- they hang off the memory-stack
  push/pop choke points, and a typed word barely has any. The default
  guards-on configuration that the REPL and the web build use went from 1631
  to 365 µs on the same benchmark.
  `WAFER_TYPED_CALLS=0` falls back to the memory-stack convention.
 - **Promotion is now per region, not per word.** Stack-to-local promotion
  used to be all-or-nothing: a single `.`, `CR`, `>R` or host call
  anywhere in a definition put the _entire_ body on the memory data
  stack, hot loops included. The stack simulator now runs over each
  stretch of a word that can live in WASM locals, loading what the
  region reads and writing back what it leaves, with the rest of the
  word unchanged around it.
  The cliff this removes was steep. The same loop, same build:
  | `: L1 0 5000000 0 DO 1+ LOOP DROP ;` reached as | µs    | ns/iter |
  | ----------------------------------------------- | ----- | ------- |
  | its own word                                    | 1571  | 0.31    |
  | inlined into a caller with a `.` in it (before) | 11100 | 2.22    |
  | the same, after this change                     | 1572  | 0.31    |
  7x, for one `i32.add`: on the memory path the accumulator is stored to
  linear memory and reloaded next iteration, so the loop-carried
  dependency runs through store-to-load forwarding instead of a
  register.
  A region may only use `I` / `J` when the DO loops naming them are
  inside the region, since the simulator resolves them against its own
  loop stack. Straight-line regions have to be at least three operations
  to be worth the load and store either side; a loop always is.
 - **The inliner no longer drags a loop onto the memory stack.** It
  inlined any callee of eight IR operations or fewer, so a small
  loop-bearing word inlined into a caller that can never be promoted
  lost its registers -- an optimisation pass applying the 7x
  pessimisation above. Loop-bearing callees now stay put in that case:
  one call is far cheaper than a loop's worth of memory traffic.
  Straight-line words still inline everywhere.
 - **`BEGIN` loops promote as well.** `BEGIN..UNTIL`, `BEGIN..AGAIN` and
  `BEGIN..WHILE..REPEAT` were rejected outright by the eligibility check,
  so any word built on the idiomatic Forth loop kept the memory data
  stack no matter how hot it was. They are promoted now when the
  construct is stack-neutral: `UNTIL` consumes exactly the flag its body
  leaves, `AGAIN`'s body is neutral, and for `WHILE..REPEAT` the test and
  the body balance separately -- `WHILE` leaves the loop between the two,
  so a net that only added up over the pair would give the two exits
  different stack shapes. Bodies containing an `EXIT` stay out, the same
  rule `DO`/`LOOP` follows. `BEGIN..WHILE..WHILE..REPEAT` is still
  excluded.
  GCD 994 -> 540 µs, Collatz 428 -> 185.
  Together these four entries put four of the five cross-engine
  benchmarks past SwiftForth `sf64`: Factorial 0.29x, Collatz 0.30x,
  NestedLoops 0.27x, GCD 0.67x. Fibonacci stays at 1.24x, being pure
  call overhead with no loop to promote.
 ### Fixed
 - **A promoted loop or `IF` whose branch permutes the stack lost a value.**
  At the bottom of a promoted loop the body's results are copied back into
  the loop-top locals, and the join after a promoted `IF` copies one
  branch's locals into the other's. Both did it one slot at a time in index
  order, which is wrong as soon as a destination is also a later source:
  `: C 3 4 2 0 DO SWAP LOOP . . ;` printed `4 4` where gforth and
  SwiftForth print `4 3`, and `2 0 DO ROT LOOP` over three cells printed
  `3 2 3` instead of `2 1 3`. The copies are now ordered so every source is
  read before it is overwritten, with one scratch local to break a cycle.
  Present since stack-to-local promotion was introduced; reachable from
  any `DO` loop or `IF` whose body reorders cells it did not create.
 - The Forth 2012 Core suite now also runs against consolidated code
  (`compliance_core_after_consolidate`). `CONSOLIDATE` had no correctness
  test at all before -- only benchmarks.
 ### Changed
 - **Three cross-engine benchmarks were too small to be measured.** GCD ran
  in 14 µs, Factorial in 49 and NestedLoops in 51, where per-run scatter is
  a good fraction of the total and fixed per-invocation costs in the other
  engines dominate. Scaled to Factorial x100K, GCD-bench(20K) and
  NestedLoops(50)x1K, all now around 0.5-1 ms.
  This changed a result rather than just steadying it: GCD looked like a
  win at 0.42x of `sf64` and was in fact a loss at 1.17x. That is what
  pointed at `BEGIN` loops as the remaining gap -- GCD is the one benchmark
  whose loop is a `BEGIN ... WHILE ... REPEAT` -- and with those promoted it
  now reads 0.67x. The regression limits, which had drifted to 3-6x looser
  than the measurements they guard, were retightened to ~45% above the
  current ratios.
 ## [0.2.6] - 2026-08-07
 ### Fixed
 - **An uncaught `ABORT` no longer prints anything.** It used to report
  `ABORT (throw -1)`, but the standard defines `ABORT` as "empty the data
  stack and perform the function of `QUIT`", and `QUIT` displays no
  message. gforth and SwiftForth are both silent here. `CATCH` still
  reports -1 as before, and `ABORT"` still prints its text — that is a
  different word with a different code (-2).
 - **Compile-only words used in interpretation state name the condition.**
  `ABORT"`, `IF`, `THEN`, `LOOP`, `LITERAL`, `RECURSE` and the rest of
  the compile-time constructs claimed to be an `unknown word`, which is
  actively misleading for a word the system obviously knows. They now
  report `interpreting a compile-only word: <name> (throw -14)`, the
  standard condition both reference engines give. A genuine typo still
  reports `unknown word`.
 ## [0.2.5] - 2026-08-06
 ### Added
 - **`QUIT`** ( -- ) ( R: i\*x -- ), the CORE word that was missing: empty
  the return stack, enter interpretation state, hand the input source
  back to the user input device and return to the interpreter without a
  message. The data stack is deliberately left alone — that is the whole
  difference to `ABORT`, which the standard defines as "empty the data
  stack, then `QUIT`". It unwinds through nested `EVALUATE` and
  `INCLUDE`, abandoning them, and `SOURCE-ID` is restored to 0.
  `CATCH` does **not** report it: `QUIT` rides throw code -56, which the
  interpreter treats as a return to the prompt rather than an exception.
  Both behaviours were checked against gforth 0.7.3 and SwiftForth
  `sf64`, which agree — `1 2 ' QUIT CATCH .` prints nothing and leaves
  `1 2` on the stack in all three engines.
  The gap had gone unnoticed because the Forth 2012 test suite skips it
  by its own admission ("I HAVEN'T FIGURED OUT HOW TO TEST KEY, QUIT,
  ABORT, OR ABORT\""), and because `HELP`'s coverage lint compares the
  dictionary against the docs — a word absent from both looks complete.
  `docs/wafer-anki.txt` had been documenting `QUIT` as if it existed.
  Note that `ABORT` was already correct: executing it while a definition
  is open does clear both stacks and return to interpretation state.
  Typing `ABORT` (or `QUIT`) into an unfinished definition compiles it
  rather than running it, exactly as in every other Forth; `[` is the
  word that gets you out.
 ## [0.2.4] - 2026-08-06
 ### Fixed
 - **Errors from host words in the browser build read like Forth errors
  again.** A host word signals failure by throwing across the JS
  boundary, and the browser runtime reported the exception with its
  `Debug` form, so an empty-stack `RESIZE` came back as
  `call_func(134) failed: JsValue(Error: Stack underflow ...)` trailed by
  an engine stack trace. The thrown message is the Forth message, so it
  is now surfaced verbatim — `Stack underflow`, exactly what the native
  CLI prints. Exceptions that carry no message keep the call context,
  since those are genuine runtime faults rather than Forth throws.
  `CATCH` was never affected: it reads the throw code from its own
  channel, not from the message.
 ## [0.2.3] - 2026-08-06
 ### Fixed
 - **Release builds of `wafer-web` no longer fail on proc-macro loading.**
  Cargo strips debuginfo from release artifacts by default, and on macOS
  that also strips the metadata proc-macro dylibs need to be loadable, so
  `wasm-pack build --release` died with `can't find crate` for
  `rustversion`, `thiserror_impl` and every other proc-macro. Build
  scripts and proc-macros gain nothing from stripping, so
  `[profile.release.build-override]` now exempts them; release binaries
  stay stripped. Debug builds were never affected, which is why the test
  suite stayed green while the browser REPL could not be built for
  production.
 - `wafer-web` and `wafer-cli` requested `wafer-core` version `0.2.1`
  while the workspace had moved to `0.2.2`. The caret requirement still
  resolved, so nothing broke, but the pin is now kept in step.
 ## [0.2.2] - 2026-08-06
 ### Added
 - **SwiftForth-style input number conversion.** Punctuation (`,` `.` `+`
  `/` `:` and an embedded `-`) anywhere after the leftmost digit now forces
  double-cell conversion, so `12.34`, `1,234`, `12:30:45` and `2026-08-06`
  all convert as doubles without a custom parser. Previously only a
  trailing `.` worked and `1.5` was an "unknown word" error. The
  punctuation is a double-cell marker, not a fractional point: every
  spelling of `1234` (`1234.`, `123.4`, `.1234`) yields the same value.
 - **`DPL`** ( -- addr ): digits to the right of the rightmost punctuation
  character in the last converted number, negative when the token carried
  none. Seeded at -1024 and bumped once per digit, matching `sf64`.
  Together with `<# #>` this is how fixed-point input is scaled.
 - **`NH`** ( -- addr ): the high-order cell dropped by a single-cell
  conversion, so a token that overflows a cell can be recovered as a
  double (`4000000000 NH @ D.`).
 Verified token-for-token against SwiftForth `sf64`: DPL values, double
 promotion and sign handling agree on every probed form. One deliberate
 divergence — WAFER also accepts a sign before a base prefix (`-$FF`), which
 `sf64` rejects; the Forth 2012 spelling `$-FF` works in both. A leading `+`
 is punctuation rather than a sign in both engines, so `+7` is the double 7
 with `DPL` = 1.
 ## [0.2.1] - 2026-08-06
 ### Fixed
 - **The search order is now authoritative** (Forth 2012 §16.3.3): a word
  whose wordlist is not in the search order is no longer findable.
  Previously lookup fell back to the newest entry across all wordlists,
  making word hiding impossible. Verified against gforth and SwiftForth,
  and guarded by a cross-engine corpus program.
 - **Host words validate their stack arguments.** Around 40 host-implemented
  words (`RND-SEED`, `ACCEPT`, `RESIZE`, `ALLOCATE`, `FREE`, `SEARCH`,
  `SUBSTITUTE`, `ROLL`, `M*`, `UM/MOD`, `SF@ SF! DF@ DF!`, `F. FE. FS. F~`,
  `2R@`, and friends) performed raw stack-pointer arithmetic with no
  underflow check — calling them on an empty stack silently corrupted the
  stack pointer (the compiled-code guards from 0.2.0 do not cover host
  words). All argument-taking host words now fail with a clean, CATCHable
  underflow error, enforced by a class-wide regression test.
 ## [0.2.0] - 2026-08-06
 The usability release: introspection, source files, honest errors, and a
 safety net under every compiled word.
 ### Added
 - **Stack guards in compiled code**: under/overflow checks at the
  stack-pointer choke points of generated WASM. Faults THROW standard codes
  (`-3`..`-6`, `-44`, `-45`), are CATCHable, and print standard messages
  instead of silently corrupting memory. Default on; `wafer build` output
  stays unguarded; `WAFER_STACK_GUARDS=0|1` overrides.
 - **`SEE`**: source-level decompiler. Colon words (including everything in
  `boot.fth`) show their captured verbatim source; data words show
  synthesized definitions with current values (`9 VALUE X`,
  `DEFER D ( IS DUP )`); primitives fall back to a readable IR dump —
  `SEE` never dead-ends on a defined word.
 - **`SEE-IR`**: post-optimization IR view with resolved callee names and
  indented control flow — shows what the optimizer actually did.
 - **`HELP`**: stack effect + one-line description for **every** word in a
  fresh VM (dictionary words and outer-interpreter tokens alike); coverage
  is enforced by a unit test, so an undocumented new word fails the build.
  User words echo their leading `( n -- n )` comment.
 - **`INCLUDE` / `INCLUDED`**: nestable source-file loading with cycle
  detection, depth bound, paths relative to the including file, and
  per-level `SOURCE-ID`. The loader is injected (CLI: filesystem; web:
  defined error), so the core stays IO-free. `wafer prog.fth` now runs
  through the same machinery.
 - **`MARKER` extensions**: `REMEMBER` (re-runnable marker), `EMPTY` and
  `GILD` (boot-state rollback and re-baselining). Marker rollback now also
  restores search order, wordlists, `REPLACES` substitutions, `ABORT"`
  texts, and captured word sources — enabling the `REMEMBER` + `INCLUDE`
  edit-reload loop.
 - **`WORDS`**: optional substring filter (`WORDS FLOAT`), word count, and
  `WORDS ALL` — a grouped full view by wordlist plus internal words.
 - **Return-stack introspection**: `.RS`, `RDEPTH`, `RP@`.
 - **Tools**: `.S` honors `BASE`, `F.S`, `?`, bounds-checked `DUMP`, real
  `BYE`, named `ORDER` output.
 - **CLI REPL**: persistent history (XDG state dir, `0600`), dictionary-backed
  tab completion, prefix history search on Up/Down, Ctrl-C clears the line.
 - **Web REPL**: history persisted to localStorage, User Words palette,
  `BASE` indicator in the stack bar.
 - **Error reporting**: uncaught `THROW` codes map to standard messages;
  `ABORT"` text prints only when uncaught; errors inside included files
  carry `file.fth:line:` context; uncaught throws are typed
  (`WaferError::UncaughtThrow`) for embedding consumers; compiled words
  carry WASM name sections, so genuine traps name the faulting word
  (`in CRASHER: wasm trap: out of bounds memory access`).
 - **SwiftForth correctness lane**: the cross-engine program corpus can run
  against sf64 as an oracle (`just compare-correctness`), alongside the
  existing gforth lane and the sf64 performance lane.
 ### Fixed
 - Multi-line command output in the CLI REPL starts on its own line
  (inline `ok` echo only for single-line output).
 - `.S` printed in decimal regardless of `BASE`.
 - A bare interpreted `R>` underflowed silently (exposed by the new stack
  guards; compliance baseline updated).
 - `SPACES` with a negative count now outputs nothing, per Forth 2012
  6.1.2230.
 ### Changed
 - `wafer prog.fth` reports errors with `file:line` context and resolves
  nested `INCLUDE`s relative to the file.
 - Internal words (`_`-prefixed) are flagged in the dictionary and hidden
  from `WORDS` and completion (`WORDS ALL` shows them).
 - Dependencies upgraded across the board: wasmtime 43 → 47,
  wasm-encoder/wasmparser 0.246 → 0.255, plus all semver-compatible
  updates.
 ## [0.1.0] - 2026-08-04
 Initial development line (untagged): Forth 2012 core with IR optimizer and
 WASM codegen via wasm-encoder/wasmtime, ~300 words across Core, Double,
 Float, String, Search-Order, Exception, and Tools word sets, Forth 2012
 compliance suite, `CONSOLIDATE` whole-program recompilation, `wafer build`
 AOT export (WASM / native / JS loader), browser REPL, SHA-1/256/512 words,
 and cross-engine benchmark lanes against gforth and SwiftForth.
 [0.2.7]: https://github.com/ok2/wafer/compare/v0.2.6...v0.2.7
 [0.2.1]: https://github.com/ok2/wafer/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/ok2/wafer/compare/v0.1.0...v0.2.0
 [0.1.0]: https://github.com/ok2/wafer/releases/tag/v0.1.0
@@ -2,7 +2,7 @@
 ## What is WAFER?
-WAFER (WebAssembly Forth Engine in Rust) is an optimizing Forth 2012 compiler targeting WebAssembly. Currently a working Forth system with 200+ words, JIT compilation, 12 word sets at 100% compliance, and a full optimization pipeline (peephole, constant folding, inlining, strength reduction, DCE, tail calls, stack-to-local promotion with loop/IF support, self-recursive direct calls, consolidation). Beats gforth on all benchmarks in release mode. Includes a browser-based REPL via wasm-pack.
+WAFER (WebAssembly Forth Engine in Rust) is an optimizing Forth 2012 compiler targeting WebAssembly. Currently a working Forth system with 200+ words, JIT compilation, 12 word sets at 100% compliance, and a full optimization pipeline (peephole, constant folding, inlining, strength reduction, DCE, tail calls, per-region stack-to-local promotion with DO/BEGIN loop and IF support, self-recursive direct calls, a typed calling convention for words with a known stack effect, consolidation). Beats gforth on all benchmarks in release mode, and SwiftForth `sf64` on four of five. Includes a browser-based REPL via wasm-pack.
 ## Architecture
@@ -79,7 +79,7 @@ Handle in `interpret_token_immediate()` or `compile_token()` as a special case.
 ## Testing
- Run `cargo test --workspace` before committing (currently 431 unit + 1 benchmark + 11 compliance + 9 comparison)
+- Run `cargo test --workspace` before committing (currently 601 unit + 1 benchmark + 12 compliance + 9 comparison + 5 crypto)
 - Forth 2012 compliance: `cargo test -p wafer-core --test compliance`
 - Cross-engine comparison (vs gforth): `cargo test -p wafer-core --test comparison`
 - Performance benchmarks (release mode): `cargo test -p wafer-core --test comparison -- --nocapture --ignored`
@@ -3,7 +3,7 @@ members = ["crates/*"]
 resolver = "2"
 [workspace.package]
-version = "0.1.0"
+version = "0.2.7"
 edition = "2024"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/ok2/wafer"
@@ -41,13 +41,21 @@ needless_collect = "warn"
 or_fun_call = "warn"
 [workspace.dependencies]
-wasm-encoder = "0.246"
+wasm-encoder = "0.255"
-wasmparser = "0.246"
+wasmparser = "0.255"
-wasmtime = "43"
+wasmtime = "47"
 anyhow = "1"
 thiserror = "2"
 proptest = "1"
 insta = "1"
-sha1 = "0.11"
+sha1 = "0.10"
-sha2 = "0.11"
+sha2 = "0.10"
 send_wrapper = "0.6"
 # Cargo strips debuginfo from release artifacts by default, and on macOS that
 # also strips the metadata proc-macro dylibs need to be loadable — release
 # builds then fail with "can't find crate" for every proc-macro (rustversion,
 # thiserror_impl, ...). Build scripts and proc-macros gain nothing from
 # stripping, so exempt them; the release binaries stay stripped.
 [profile.release.build-override]
 strip = false
@@ -47,6 +47,10 @@ bench-opts:
 bench-compare:
    CARGO_PROFILE_RELEASE_STRIP=none cargo test -p wafer-core --release --test comparison -- --nocapture --ignored performance_report
 # Cross-engine correctness lanes: program corpus vs gforth + sf64 oracles
 compare-correctness:
    cargo test -p wafer-core --test comparison -- --nocapture --ignored compare_all_programs
 # Check dependency licenses and advisories
 deny:
    cargo deny check
@@ -62,6 +66,13 @@ ci: fmt clippy deny test
 check:
    cargo check --workspace
 # Install the wafer CLI (release build) and bat syntax highlighting.
 # STRIP=none: Cargo's release default (strip = "debuginfo") emits dylibs that
 # macOS 27's dyld rejects ("mis-aligned LINKEDIT string pool"), so proc macros
 # fail to load during the build itself.
 install: install-syntax
    CARGO_PROFILE_RELEASE_STRIP=none cargo install --path crates/cli --locked
 # Install bat syntax highlighting for WAFER / Forth
 install-syntax:
    mkdir -p ~/.config/bat/syntaxes
@@ -7,10 +7,11 @@ An optimizing Forth 2012 compiler targeting WebAssembly. WAFER JIT-compiles each
 ## Highlights
 - **200+ words** across 12 Forth 2012 word sets, all at **100% compliance**
- **Optimizing compiler** with 6 IR passes + stack-to-local promotion (loops + IF) + consolidation
+- **Optimizing compiler** with 6 IR passes + stack-to-local promotion (per region, so a hot loop keeps its registers even inside a word that does I/O; `DO` and `BEGIN` loops alike) + consolidation
 - **Faster than gforth** on all benchmarks in release mode (2-10x faster)
 - **JIT compilation** — each `:` definition compiles to its own WASM module
 - **Self-recursive direct calls** — RECURSE compiles to native `call` instead of `call_indirect`
 - **Typed calling convention** — a word with a statically known stack effect passes its stack items as WASM values, so a call keeps them in registers instead of round-tripping through memory
 - **Consolidation mode** — recompile all words into a single optimized WASM module
 - **Interactive REPL** with line editing (rustyline)
 - **Browser REPL** — runs entirely in the browser via wasm-pack + js-sys
@@ -79,23 +80,36 @@ git submodule update --init
 ## Performance
-WAFER beats gforth (the GNU Forth reference implementation) on all benchmarks in release mode:
+WAFER beats gforth (the GNU Forth reference implementation) on all benchmarks in release mode, and is within
 reach of SwiftForth `sf64`, which compiles to native code:
 ```
-Benchmark                   WAFER     CONSOL     gforth      WAFER/gf
+Benchmark                   WAFER     CONSOL     gforth       sf64    WAFER/gf   WAFER/sf
-Fibonacci(25)                1629       1535       3422        0.45x
+Fibonacci(25)                 356        361       3389        287       0.11x      1.24x
-Factorial(12)x10K             340        339        638        0.53x
+Factorial(12)x100K            479        495       6249       1650       0.08x      0.29x
-GCD-bench(500)                 18         15         30        0.50x
+GCD-bench(20K)                540        559       1801        801       0.30x      0.67x
-NestedLoops(50)                84         73        720        0.10x
+NestedLoops(50)x1K            509        501       7023       1887       0.07x      0.27x
-Collatz(2K)                  1212       1202       3914        0.31x
+Collatz(2K)                   185        213       3873        610       0.05x      0.30x
 ```
 Times in microseconds. WAFER/gf < 1.0 means WAFER is faster. CONSOL = after `CONSOLIDATE`.
 Two caveats on the `sf64` column. The SwiftForth build here is x86-64 running under Rosetta 2
 while WAFER and gforth are native arm64, so it is a native-vs-emulated comparison; and sf64
 uses 64-bit cells to WAFER's 32-bit. WAFER is ahead on the four loop-heavy benchmarks and
 behind on Fibonacci, which is one call per node with no loop to promote.
 A word whose stack effect is statically known gets a **typed entry point**: its stack items travel in and out
 as WASM values instead of through the memory data stack, so cranelift keeps them in registers across a call
 the way a native Forth keeps TOS in one. The word also keeps a `( -- )` wrapper, which is what the function
 table, `EXECUTE` and the outer interpreter reach, so nothing about the memory ABI changes from the outside.
 Call-heavy code is what this pays for -- Fibonacci went from 4.3x slower than `sf64` to 1.2x. Set
 `WAFER_TYPED_CALLS=0` to fall back to the memory-stack convention.
 ## Testing
 ```bash
-# All tests (~450 currently passing)
+# All tests (~628 currently passing)
 cargo test --workspace
 # Forth 2012 compliance suite
@@ -128,7 +142,7 @@ Forth Source -> Outer Interpreter -> IR -> [Optimize] -> WASM Codegen (wasm-enco
  - `WebRuntime` — browser WebAssembly API via js-sys, for the browser REPL
 - **Subroutine threading** via WASM function tables (`call_indirect` for cross-word, direct `call` for self-recursion)
 - **JIT mode**: each new word compiles to a separate WASM module linked to shared memory/globals/table
- **IR-based pipeline** with 6 optimization passes (peephole, constant folding, strength reduction, DCE, tail call detection, inlining) plus stack-to-local promotion (with loop and IF/ELSE support), DO/LOOP index locals, and consolidation
+- **IR-based pipeline** with 6 optimization passes (peephole, constant folding, strength reduction, DCE, tail call detection, inlining) plus per-region stack-to-local promotion (DO and BEGIN loops, IF/ELSE), DO/LOOP index locals, typed entry points for words with a known stack effect, and consolidation
 - **Dictionary**: linked-list word headers in simulated linear memory
 ## Project Structure
@@ -185,6 +199,7 @@ Over 200 words are implemented across the following categories:
 | Strings      | `COMPARE SEARCH SLITERAL REPLACES SUBSTITUTE UNESCAPE`                                                          |
 | Floating-Pt  | `F+ F- F* F/ FABS FNEGATE FSQRT FSIN FCOS FTAN FEXP FLOG FMIN FMAX` and 55+ more                                |
 | Case         | `CASE OF ENDOF ENDCASE`                                                                                         |
 | Tools        | `WORDS SEE SEE-IR HELP INCLUDE INCLUDED .S F.S ? DUMP MARKER REMEMBER EMPTY GILD BYE`                           |
 ## Web REPL
@@ -9,7 +9,7 @@ license.workspace = true
 workspace = true
 [dependencies]
-wafer-core = { path = "../core", version = "0.1.0" }
+wafer-core = { path = "../core", version = "0.2.7" }
 wasmtime = { workspace = true }
 anyhow = { workspace = true }
 clap = { version = "4", features = ["derive"] }
@@ -139,6 +139,7 @@ fn cmd_build(
    // Exported modules are production artifacts: no stack guards by default
    let mut vm = ForthVM::<NativeRuntime>::new_with_config(vm_config(false))?;
    vm.set_source_loader(fs_loader());
    vm.set_recording(true);
    vm.evaluate(&source)?;
@@ -262,7 +263,8 @@ fn cmd_run(file: &str) -> anyhow::Result<()> {
 }
 /// `WaferConfig` for CLI-created VMs. `WAFER_STACK_GUARDS=0|1` overrides
-/// the per-command default (REPL/file execution on, build off).
+/// the per-command default (REPL/file execution on, build off);
 /// `WAFER_TYPED_CALLS=0` falls back to the memory-stack calling convention.
 fn vm_config(default_guards: bool) -> wafer_core::config::WaferConfig {
    let mut cfg = wafer_core::config::WaferConfig::all();
    cfg.codegen.stack_guards = match std::env::var("WAFER_STACK_GUARDS").ok().as_deref() {
@@ -270,21 +272,30 @@ fn vm_config(default_guards: bool) -> wafer_core::config::WaferConfig {
        Some(_) => true,
        None => default_guards,
    };
    cfg.codegen.typed_calls = std::env::var("WAFER_TYPED_CALLS").ok().as_deref() != Some("0");
    cfg
 }
 /// Filesystem source loader for INCLUDE/INCLUDED.
 fn fs_loader() -> Box<dyn Fn(&str) -> anyhow::Result<String> + Send + Sync> {
    Box::new(|path| Ok(std::fs::read_to_string(path)?))
 }
 /// `wafer` (REPL) or `wafer program.fth` (evaluate and exit)
 fn cmd_eval_or_repl(file: Option<&str>) -> anyhow::Result<()> {
    let mut vm = ForthVM::<NativeRuntime>::new_with_config(vm_config(true))?;
    vm.set_source_loader(fs_loader());
    match file {
        Some(file) => {
-            let source = std::fs::read_to_string(file)?;
+            // Through the include machinery: file:line error context and a
-            vm.evaluate(&source)?;
+            // base directory for nested INCLUDEs.
            let result = vm.include(file);
            let output = vm.take_output();
            if !output.is_empty() {
                print!("{output}");
            }
            result?;
        }
        None => {
            if !stdin_is_tty() {
@@ -303,7 +314,7 @@ fn cmd_eval_or_repl(file: Option<&str>) -> anyhow::Result<()> {
                            }
                        }
                        Err(e) => {
-                            eprintln!("Error: {e}");
+                            eprintln!("Error: {e:#}");
                        }
                    }
                }
@@ -459,7 +470,7 @@ fn run_repl(vm: &mut ForthVM<NativeRuntime>) -> anyhow::Result<()> {
                        }
                    }
                    Err(e) => {
-                        eprintln!("Error: {e}");
+                        eprintln!("Error: {e:#}");
                    }
                }
                // New definitions may have appeared: refresh completion
@@ -197,8 +197,8 @@
 \ TYPE ( c-addr u -- )  output u characters
 : TYPE  0 ?DO DUP C@ EMIT 1+ LOOP DROP ;
-\ SPACES ( n -- )  output n spaces
+\ SPACES ( n -- )  output n spaces (nothing for n <= 0, per 6.1.2230)
-: SPACES  0 ?DO SPACE LOOP ;
+: SPACES  0 MAX 0 ?DO SPACE LOOP ;
 \ Pictured numeric output constants
 \ PICT_BUF_TOP = 0x05C0 = 1472, SYSVAR_HLD = 28
@@ -258,6 +258,21 @@
 \ D.R ( d width -- )  print right-justified signed double
 : D.R  >R SWAP OVER DABS <# #S ROT SIGN #> R> OVER - SPACES TYPE ;
 \ ---------------------------------------------------------------
 \ Return-stack introspection (debug aids)
 \ ---------------------------------------------------------------
 \ RDEPTH ( -- n )  number of cells on the return stack
 \ RETURN_STACK_TOP = 9728 (0x2600). Only >R temps and loop params
 \ live there; return addresses are on the WASM call stack.
 : RDEPTH  9728 RP@ - 2 RSHIFT ;
 \ .RS ( -- )  print the return stack bottom-to-top, like .S
 \ Walks with BEGIN/WHILE (not DO) so the walk itself never pushes
 \ onto the return stack it is printing.
 : .RS  ." R:<" RDEPTH 0 .R ." > "
   9728 BEGIN DUP RP@ > WHILE 4 - DUP @ . REPEAT DROP ;
 \ ---------------------------------------------------------------
 \ Phase 6: DEFER support
 \ ---------------------------------------------------------------
@@ -12,6 +12,11 @@ pub struct CodegenOpts {
    /// corrupting stack pointers. On by default; benchmarks and
    /// exported production modules turn it off.
    pub stack_guards: bool,
    /// Compile words with a statically known stack effect to a typed entry
    /// point that carries stack items in WASM values, so a call keeps them
    /// in registers instead of round-tripping through the memory stack.
    /// On by default; `WAFER_TYPED_CALLS=0` turns it off.
    pub typed_calls: bool,
 }
 /// Master configuration for all WAFER optimizations.
@@ -38,6 +43,7 @@ impl WaferConfig {
            codegen: CodegenOpts {
                stack_to_local_promotion: true,
                stack_guards: true,
                typed_calls: true,
            },
        }
    }
@@ -56,6 +62,7 @@ impl WaferConfig {
            codegen: CodegenOpts {
                stack_to_local_promotion: false,
                stack_guards: false,
                typed_calls: false,
            },
        }
    }
@@ -21,7 +21,7 @@ mod tests {
        // Empty word list should produce nothing (but we guard against this at call site)
        let words = vec![];
        let map = HashMap::new();
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        // Empty is valid -- should produce a valid module with no functions
        assert!(result.is_ok());
    }
@@ -31,7 +31,7 @@ mod tests {
        let words = vec![(WordId(1), vec![IrOp::PushI32(42)])];
        let mut map = HashMap::new();
        map.insert(WordId(1), 1u32); // function index 1 (after emit import)
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
@@ -49,7 +49,7 @@ mod tests {
        map.insert(WordId(1), 1u32);
        map.insert(WordId(2), 2u32);
        map.insert(WordId(3), 3u32);
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
@@ -59,7 +59,7 @@ mod tests {
        let words = vec![(WordId(3), vec![IrOp::Call(WordId(99))])];
        let mut map = HashMap::new();
        map.insert(WordId(3), 1u32);
-        let result = compile_consolidated_module(&words, &map, 256, None);
+        let result = compile_consolidated_module(&words, &map, 256, None, true);
        assert!(result.is_ok());
    }
@@ -72,7 +72,7 @@ mod tests {
        let mut map = HashMap::new();
        map.insert(WordId(1), 1u32);
        map.insert(WordId(2), 2u32);
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
@@ -95,7 +95,7 @@ mod tests {
        let mut map = HashMap::new();
        map.insert(WordId(1), 1u32);
        map.insert(WordId(2), 2u32);
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
@@ -120,7 +120,7 @@ mod tests {
        let mut map = HashMap::new();
        map.insert(WordId(1), 1u32);
        map.insert(WordId(2), 2u32);
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
@@ -141,7 +141,7 @@ mod tests {
        let mut map = HashMap::new();
        map.insert(WordId(1), 1u32);
        map.insert(WordId(2), 2u32);
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
@@ -163,7 +163,7 @@ mod tests {
        let mut map = HashMap::new();
        map.insert(WordId(1), 1u32);
        map.insert(WordId(2), 2u32);
-        let result = compile_consolidated_module(&words, &map, 16, None);
+        let result = compile_consolidated_module(&words, &map, 16, None, true);
        assert!(result.is_ok());
    }
 }
@@ -192,10 +192,9 @@ impl Dictionary {
                    }
                }
            }
-            // Fallback: return newest entry across all wordlists
+            // In no wordlist of the search order: not findable
-            if let Some(&(_wid, word_addr, fn_index, is_immediate)) = entries.last() {
+            // (Forth 2012 §16.3.3 — the order is authoritative).
-                return Some((word_addr, WordId(fn_index), is_immediate));
+            return None;
            }
        }
        // Fallback: linked-list walk (for words not yet in the index)
@@ -420,18 +419,33 @@ impl Dictionary {
    /// Return names of all visible (non-hidden) words, newest first.
    /// With `include_internal` false, words flagged INTERNAL are skipped.
    pub fn visible_words(&self, include_internal: bool) -> Vec<String> {
-        let mut names = Vec::new();
+        self.visible_entries()
            .into_iter()
            .filter(|(_, _, internal)| include_internal || !internal)
            .map(|(name, _, _)| name)
            .collect()
    }
    /// All visible (non-hidden) entries, newest first:
    /// (name, wordlist id, INTERNAL flag). The wid comes from the hash
    /// index (entries themselves store no wid); words missing from the
    /// index default to wid 1 (FORTH).
    pub fn visible_entries(&self) -> Vec<(String, u32, bool)> {
        let mut entries = Vec::new();
        let mut addr = self.latest;
        while addr != 0 {
            let flags_byte = self.memory[(addr + 4) as usize];
-            let skip = flags_byte & flags::HIDDEN != 0
+            if flags_byte & flags::HIDDEN == 0 {
                || (!include_internal && flags_byte & flags::INTERNAL != 0);
            if !skip {
                let name_len = (flags_byte & flags::LENGTH_MASK) as usize;
                let name_start = (addr + 5) as usize;
                let name = String::from_utf8_lossy(&self.memory[name_start..name_start + name_len])
                    .to_string();
-                names.push(name);
+                let wid = self
                    .index
                    .get(&name)
                    .and_then(|es| es.iter().find(|e| e.1 == addr))
                    .map_or(1, |e| e.0);
                entries.push((name, wid, flags_byte & flags::INTERNAL != 0));
            }
            let link = self.read_u32_unchecked(addr);
            if link == addr {
@@ -439,7 +453,7 @@ impl Dictionary {
            }
            addr = link;
        }
-        names
+        entries
    }
    /// Get a reference to the raw memory buffer.
@@ -61,6 +61,13 @@ pub enum WaferError {
    #[error("{0}")]
    Abort(String),
    /// An uncaught Forth THROW as reported to the user. `message` is the
    /// full display text (standard message or ABORT" payload); `code`
    /// carries the THROW code for typed consumers (CLI exit paths, web
    /// REPL styling) via `Error::downcast_ref`.
    #[error("{message}")]
    UncaughtThrow { code: i32, message: String },
 }
 /// Result type alias for WAFER operations.
@@ -126,6 +126,7 @@ pub fn export_module(
        table_size,
        &export_sections,
        vm.stack_guard_param(),
        vm.typed_calls(),
    )
    .map_err(|e| anyhow::anyhow!("export codegen error: {e}"))?;
@@ -159,6 +159,8 @@ pub enum IrOp {
    Execute,
    /// Push the current data-stack pointer: ( -- addr )
    SpFetch,
    /// Push the current return-stack pointer: ( -- addr )
    RpFetch,
    // -- Float stack manipulation --
    /// Float duplicate: ( F: r -- r r )
@@ -24,6 +24,8 @@ pub mod ir;
 pub mod memory;
 pub mod optimizer;
 pub mod runtime;
 pub mod see;
 pub mod wordhelp;
 // Outer interpreter: runtime-agnostic, works with any Runtime impl
 #[allow(trivial_numeric_casts, clippy::unnecessary_cast)]
@@ -108,6 +108,23 @@ pub const SYSVAR_HLD: u32 = SYSVAR_BASE + 28;
 pub const SYSVAR_LEAVE_FLAG: u32 = SYSVAR_BASE + 32;
 /// Throw code left by a compiled stack-guard fault for `_STACK_FAULT_`.
 pub const SYSVAR_FAULT_CODE: u32 = SYSVAR_BASE + 36;
 /// DPL: digits right of the rightmost punctuation in the last converted
 /// number; negative when the token carried no punctuation.
 pub const SYSVAR_DPL: u32 = SYSVAR_BASE + 40;
 /// NH: high-order cell of the last single-cell conversion, so an
 /// out-of-range token can be recovered as a double.
 pub const SYSVAR_NH: u32 = SYSVAR_BASE + 44;
 /// Seed for [`SYSVAR_DPL`] before conversion starts.
 ///
 /// `SwiftForth` seeds DPL with a negative value and bumps it once per digit,
 /// so an unpunctuated token still ends up negative. Punctuation resets the
 /// counter to zero, which makes the final value the digit count right of the
 /// rightmost punctuation character.
 ///
 /// The exact seed is observable: `sf64` reports DPL as -1020 after `1234`
 /// and -1023 after `-1`, both of which pin it to -1024.
 pub const DPL_INIT: i32 = -1024;
 #[cfg(test)]
 mod tests {
@@ -149,6 +166,9 @@ mod tests {
            SYSVAR_NUM_TIB,
            SYSVAR_HLD,
            SYSVAR_LEAVE_FLAG,
            SYSVAR_FAULT_CODE,
            SYSVAR_DPL,
            SYSVAR_NH,
        ];
        for offset in all_offsets {
            assert!(offset + CELL_SIZE <= SYSVAR_BASE + SYSVAR_SIZE);
@@ -53,7 +53,12 @@ pub fn optimize(
    // Phase 2: inline then simplify again
    if config.inline {
-        ir = inline(ir, bodies, 8);
+        // A caller that can never leave the memory data stack would drag an
        // inlined loop down with it, so leave those callees where they are:
        // as their own word the loop keeps its registers, and one call is far
        // cheaper than a loop's worth of memory traffic.
        let keep_loops_out = !crate::codegen::promotable_modulo_calls(&ir);
        ir = inline(ir, bodies, 8, keep_loops_out);
    }
    if config.peephole {
        ir = peephole(ir);
@@ -496,7 +501,12 @@ fn dce(ops: Vec<IrOp>) -> Vec<IrOp> {
 /// Inline small word bodies: replaces `Call(id)` with the word's IR body
 /// if the body is small enough and not recursive.
-fn inline(ops: Vec<IrOp>, bodies: &HashMap<WordId, Vec<IrOp>>, max_size: usize) -> Vec<IrOp> {
+fn inline(
    ops: Vec<IrOp>,
    bodies: &HashMap<WordId, Vec<IrOp>>,
    max_size: usize,
    keep_loops_out: bool,
 ) -> Vec<IrOp> {
    let mut out = Vec::new();
    for op in ops {
        match &op {
@@ -505,6 +515,7 @@ fn inline(ops: Vec<IrOp>, bodies: &HashMap<WordId, Vec<IrOp>>, max_size: usize)
                    && body.len() <= max_size
                    && !contains_call_to(body, *id)
                    && !contains_exit(body)
                    && !(keep_loops_out && crate::codegen::contains_loop(body))
                {
                    // Inline the body, recursively converting TailCall back to Call
                    // (tail position in the callee is not tail position in the caller).
@@ -517,7 +528,7 @@ fn inline(ops: Vec<IrOp>, bodies: &HashMap<WordId, Vec<IrOp>>, max_size: usize)
            }
            _ => {
                out.push(apply_to_bodies(op, &|inner| {
-                    inline(inner, bodies, max_size)
+                    inline(inner, bodies, max_size, keep_loops_out)
                }));
            }
        }
@@ -1012,4 +1023,54 @@ mod tests {
        let result = optimize(vec![IrOp::Call(WordId(5))], &config, &bodies);
        assert_eq!(result, vec![IrOp::Call(WordId(5))]);
    }
    #[test]
    fn keeps_a_loop_out_of_a_caller_stuck_on_the_memory_stack() {
        // The caller has a `.`, so it can never leave the memory data stack.
        // Inlining the loop would drag it down too; as its own word the loop
        // keeps its registers and the caller just pays one call.
        let mut bodies = HashMap::new();
        bodies.insert(
            WordId(5),
            vec![IrOp::DoLoop {
                body: vec![IrOp::PushI32(1), IrOp::Add],
                is_plus_loop: false,
            }],
        );
        let result = opt_with_inline(vec![IrOp::Call(WordId(5)), IrOp::Dot], &bodies);
        assert!(
            matches!(result.first(), Some(IrOp::Call(WordId(5)))),
            "loop should not have been inlined, got {result:?}"
        );
    }
    #[test]
    fn still_inlines_a_loop_into_a_caller_that_can_be_promoted() {
        let mut bodies = HashMap::new();
        bodies.insert(
            WordId(5),
            vec![IrOp::DoLoop {
                body: vec![IrOp::PushI32(1), IrOp::Add],
                is_plus_loop: false,
            }],
        );
        let result = opt_with_inline(vec![IrOp::Call(WordId(5)), IrOp::Dup], &bodies);
        assert!(
            !result.iter().any(|op| matches!(op, IrOp::Call(_))),
            "loop should have been inlined, got {result:?}"
        );
    }
    #[test]
    fn still_inlines_straight_line_words_anywhere() {
        // Only loops are held back; a small straight-line word is still
        // better off inlined even into an unpromotable caller.
        let mut bodies = HashMap::new();
        bodies.insert(WordId(5), vec![IrOp::Dup, IrOp::Mul]);
        let result = opt_with_inline(vec![IrOp::Call(WordId(5)), IrOp::Dot], &bodies);
        assert!(
            !result.iter().any(|op| matches!(op, IrOp::Call(_))),
            "straight-line word should still inline, got {result:?}"
        );
    }
 }
@@ -98,11 +98,29 @@ impl HostAccess for CallerHostAccess<'_, '_> {
        let func = *func_ref
            .unwrap_func()
            .ok_or_else(|| anyhow::anyhow!("call_func: null funcref {fn_index}"))?;
-        func.call(&mut *self.caller, &[], &mut [])?;
+        func.call(&mut *self.caller, &[], &mut [])
            .map_err(name_trap_frame)?;
        Ok(())
    }
 }
 /// Prefix a wasmtime trap error with the innermost named WASM frame.
 /// Compiled words carry their Forth name in the module name section, so a
 /// genuine trap reads "in <WORD>: wasm trap: ...". THROW-driven unwinds
 /// also pass through here, but CATCH and `describe_uncaught` key on the
 /// shared `throw_code` cell, never on the message, so the wrap is inert
 /// for them.
 fn name_trap_frame(e: wasmtime::Error) -> wasmtime::Error {
    let name = e
        .downcast_ref::<wasmtime::WasmBacktrace>()
        .and_then(|bt| bt.frames().iter().find_map(|f| f.func_name()))
        .map(str::to_string);
    match name {
        Some(n) => e.context(format!("in {n}")),
        None => e,
    }
 }
 /// Wasmtime-based native runtime.
 pub struct NativeRuntime {
    engine: Engine,
@@ -293,7 +311,8 @@ impl Runtime for NativeRuntime {
        let func = *r
            .unwrap_func()
            .ok_or_else(|| anyhow::anyhow!("word {fn_index} is null funcref"))?;
-        func.call(&mut self.store, &[], &mut [])?;
+        func.call(&mut self.store, &[], &mut [])
            .map_err(name_trap_frame)?;
        Ok(())
    }
@@ -0,0 +1,376 @@
 //! IR pretty-printer for `SEE-IR` and the `SEE` fallback path.
 //!
 //! Renders a post-optimization IR body as indented, one-op-per-line text.
 //! Simple ops print as short lowercase mnemonics (Forth glyphs where they
 //! are universally recognizable: `@`, `!`, `0=`, `>r`, ...); structured ops
 //! print as Forth control words with 2-space indented bodies. Calls resolve
 //! `WordId`s to names through an optional resolver so the formatter itself
 //! stays independent of the VM.
 use crate::dictionary::WordId;
 use crate::ir::IrOp;
 /// Format an IR body as indented, one-op-per-line text.
 pub fn format_ir(ops: &[IrOp]) -> String {
    format_ir_with(ops, &|_| None)
 }
 /// Like [`format_ir`], resolving `Call`/`TailCall`/`Execute` targets to word
 /// names via `resolve`; unresolved ids print as `#N`.
 pub fn format_ir_with(ops: &[IrOp], resolve: &dyn Fn(WordId) -> Option<String>) -> String {
    let mut out = String::new();
    write_ops(&mut out, ops, 0, resolve);
    out
 }
 fn line(out: &mut String, depth: usize, text: &str) {
    for _ in 0..depth {
        out.push_str("  ");
    }
    out.push_str(text);
    out.push('\n');
 }
 fn callee(id: WordId, resolve: &dyn Fn(WordId) -> Option<String>) -> String {
    resolve(id).unwrap_or_else(|| format!("#{}", id.0))
 }
 fn write_ops(
    out: &mut String,
    ops: &[IrOp],
    depth: usize,
    resolve: &dyn Fn(WordId) -> Option<String>,
 ) {
    for op in ops {
        write_op(out, op, depth, resolve);
    }
 }
 fn write_op(out: &mut String, op: &IrOp, depth: usize, resolve: &dyn Fn(WordId) -> Option<String>) {
    // Exhaustive on purpose: a new IrOp variant must show up here at
    // compile time, not silently render wrong.
    let simple: String = match op {
        // -- Literals --
        IrOp::PushI32(v) => format!("push {v}"),
        IrOp::PushI64(v) => format!("push64 {v}"),
        IrOp::PushF64(v) => format!("fpush {v}"),
        // -- Stack manipulation --
        IrOp::Drop => "drop".into(),
        IrOp::Dup => "dup".into(),
        IrOp::Swap => "swap".into(),
        IrOp::Over => "over".into(),
        IrOp::Rot => "rot".into(),
        IrOp::Nip => "nip".into(),
        IrOp::Tuck => "tuck".into(),
        IrOp::TwoDup => "2dup".into(),
        IrOp::TwoDrop => "2drop".into(),
        // -- Arithmetic --
        IrOp::Add => "add".into(),
        IrOp::Sub => "sub".into(),
        IrOp::Mul => "mul".into(),
        IrOp::DivMod => "divmod".into(),
        IrOp::Negate => "negate".into(),
        IrOp::Abs => "abs".into(),
        // -- Comparison --
        IrOp::Eq => "eq".into(),
        IrOp::NotEq => "ne".into(),
        IrOp::Lt => "lt".into(),
        IrOp::Gt => "gt".into(),
        IrOp::LtUnsigned => "u<".into(),
        IrOp::ZeroEq => "0=".into(),
        IrOp::ZeroLt => "0<".into(),
        // -- Logic --
        IrOp::And => "and".into(),
        IrOp::Or => "or".into(),
        IrOp::Xor => "xor".into(),
        IrOp::Invert => "invert".into(),
        IrOp::Lshift => "lshift".into(),
        IrOp::Rshift => "rshift".into(),
        IrOp::ArithRshift => "arshift".into(),
        // -- Memory --
        IrOp::Fetch => "@".into(),
        IrOp::Store => "!".into(),
        IrOp::CFetch => "c@".into(),
        IrOp::CStore => "c!".into(),
        IrOp::PlusStore => "+!".into(),
        // -- Calls --
        IrOp::Call(id) => format!("call {}", callee(*id, resolve)),
        IrOp::TailCall(id) => format!("tail-call {}", callee(*id, resolve)),
        // -- Structured control flow (multi-line) --
        IrOp::If {
            then_body,
            else_body,
        } => {
            line(out, depth, "if");
            write_ops(out, then_body, depth + 1, resolve);
            if let Some(eb) = else_body {
                line(out, depth, "else");
                write_ops(out, eb, depth + 1, resolve);
            }
            line(out, depth, "then");
            return;
        }
        IrOp::DoLoop { body, is_plus_loop } => {
            line(out, depth, "do");
            write_ops(out, body, depth + 1, resolve);
            line(out, depth, if *is_plus_loop { "+loop" } else { "loop" });
            return;
        }
        IrOp::BeginUntil { body } => {
            line(out, depth, "begin");
            write_ops(out, body, depth + 1, resolve);
            line(out, depth, "until");
            return;
        }
        IrOp::BeginAgain { body } => {
            line(out, depth, "begin");
            write_ops(out, body, depth + 1, resolve);
            line(out, depth, "again");
            return;
        }
        IrOp::BeginWhileRepeat { test, body } => {
            line(out, depth, "begin");
            write_ops(out, test, depth + 1, resolve);
            line(out, depth, "while");
            write_ops(out, body, depth + 1, resolve);
            line(out, depth, "repeat");
            return;
        }
        IrOp::BeginDoubleWhileRepeat {
            outer_test,
            inner_test,
            body,
            after_repeat,
            else_body,
        } => {
            line(out, depth, "begin");
            write_ops(out, outer_test, depth + 1, resolve);
            line(out, depth, "while");
            write_ops(out, inner_test, depth + 1, resolve);
            line(out, depth, "while");
            write_ops(out, body, depth + 1, resolve);
            line(out, depth, "repeat");
            write_ops(out, after_repeat, depth + 1, resolve);
            if let Some(eb) = else_body {
                line(out, depth, "else");
                write_ops(out, eb, depth + 1, resolve);
            }
            line(out, depth, "then");
            return;
        }
        IrOp::Exit => "exit".into(),
        IrOp::LoopRestartIfFalse => "loop-restart-if-false".into(),
        // -- Flat forward branches --
        IrOp::Block(l) => format!("block L{l}"),
        IrOp::BranchIfFalse(l) => format!("branch-if-false L{l}"),
        IrOp::EndBlock(l) => format!("end-block L{l}"),
        // -- Return stack --
        IrOp::ToR => ">r".into(),
        IrOp::FromR => "r>".into(),
        IrOp::RFetch => "r@".into(),
        IrOp::LoopJ => "j".into(),
        // -- Forth locals --
        IrOp::ForthLocalGet(n) => format!("local@ {n}"),
        IrOp::ForthLocalSet(n) => format!("local! {n}"),
        IrOp::ForthFLocalGet(n) => format!("flocal@ {n}"),
        IrOp::ForthFLocalSet(n) => format!("flocal! {n}"),
        // -- I/O --
        IrOp::Emit => "emit".into(),
        IrOp::Dot => ".".into(),
        IrOp::Cr => "cr".into(),
        IrOp::Type => "type".into(),
        // -- System --
        IrOp::Execute => "execute".into(),
        IrOp::SpFetch => "sp@".into(),
        IrOp::RpFetch => "rp@".into(),
        // -- Float stack --
        IrOp::FDup => "fdup".into(),
        IrOp::FDrop => "fdrop".into(),
        IrOp::FSwap => "fswap".into(),
        IrOp::FOver => "fover".into(),
        // -- Float arithmetic --
        IrOp::FAdd => "fadd".into(),
        IrOp::FSub => "fsub".into(),
        IrOp::FMul => "fmul".into(),
        IrOp::FDiv => "fdiv".into(),
        IrOp::FNegate => "fnegate".into(),
        IrOp::FAbs => "fabs".into(),
        IrOp::FSqrt => "fsqrt".into(),
        IrOp::FMin => "fmin".into(),
        IrOp::FMax => "fmax".into(),
        IrOp::FFloor => "ffloor".into(),
        IrOp::FRound => "fround".into(),
        // -- Float comparisons --
        IrOp::FZeroEq => "f0=".into(),
        IrOp::FZeroLt => "f0<".into(),
        IrOp::FEq => "f=".into(),
        IrOp::FLt => "f<".into(),
        // -- Float memory --
        IrOp::FetchFloat => "f@".into(),
        IrOp::StoreFloat => "f!".into(),
        // -- Conversions --
        IrOp::StoF => "s>f".into(),
        IrOp::FtoS => "f>s".into(),
    };
    line(out, depth, &simple);
 }
 #[cfg(test)]
 mod tests {
    use super::*;
    #[test]
    fn simple_ops_one_per_line() {
        let out = format_ir(&[IrOp::Dup, IrOp::Mul, IrOp::PushI32(7)]);
        assert_eq!(out, "dup\nmul\npush 7\n");
    }
    #[test]
    fn call_resolves_via_resolver() {
        let ops = [IrOp::Call(WordId(12)), IrOp::TailCall(WordId(13))];
        assert_eq!(format_ir(&ops), "call #12\ntail-call #13\n");
        let named = format_ir_with(&ops, &|id| (id.0 == 12).then(|| "SQ".to_string()));
        assert_eq!(named, "call SQ\ntail-call #13\n");
    }
    #[test]
    fn nested_if_inside_do_loop_indents() {
        let ops = [IrOp::DoLoop {
            body: vec![
                IrOp::Dup,
                IrOp::If {
                    then_body: vec![IrOp::Dup, IrOp::Mul],
                    else_body: Some(vec![IrOp::Drop]),
                },
            ],
            is_plus_loop: false,
        }];
        let expected = "do\n  dup\n  if\n    dup\n    mul\n  else\n    drop\n  then\nloop\n";
        assert_eq!(format_ir(&ops), expected);
    }
    #[test]
    fn while_loops_and_flat_branches() {
        let ops = [
            IrOp::BeginWhileRepeat {
                test: vec![IrOp::Dup],
                body: vec![IrOp::PushI32(1), IrOp::Sub],
            },
            IrOp::Block(3),
            IrOp::BranchIfFalse(3),
            IrOp::EndBlock(3),
        ];
        let expected = "begin\n  dup\nwhile\n  push 1\n  sub\nrepeat\nblock L3\nbranch-if-false L3\nend-block L3\n";
        assert_eq!(format_ir(&ops), expected);
    }
    #[test]
    fn every_simple_variant_renders() {
        // One of each non-structured op; count of output lines must match.
        let ops = vec![
            IrOp::PushI32(1),
            IrOp::PushI64(2),
            IrOp::PushF64(1.5),
            IrOp::Drop,
            IrOp::Dup,
            IrOp::Swap,
            IrOp::Over,
            IrOp::Rot,
            IrOp::Nip,
            IrOp::Tuck,
            IrOp::TwoDup,
            IrOp::TwoDrop,
            IrOp::Add,
            IrOp::Sub,
            IrOp::Mul,
            IrOp::DivMod,
            IrOp::Negate,
            IrOp::Abs,
            IrOp::Eq,
            IrOp::NotEq,
            IrOp::Lt,
            IrOp::Gt,
            IrOp::LtUnsigned,
            IrOp::ZeroEq,
            IrOp::ZeroLt,
            IrOp::And,
            IrOp::Or,
            IrOp::Xor,
            IrOp::Invert,
            IrOp::Lshift,
            IrOp::Rshift,
            IrOp::ArithRshift,
            IrOp::Fetch,
            IrOp::Store,
            IrOp::CFetch,
            IrOp::CStore,
            IrOp::PlusStore,
            IrOp::Call(WordId(1)),
            IrOp::TailCall(WordId(2)),
            IrOp::Exit,
            IrOp::LoopRestartIfFalse,
            IrOp::Block(1),
            IrOp::BranchIfFalse(1),
            IrOp::EndBlock(1),
            IrOp::ToR,
            IrOp::FromR,
            IrOp::RFetch,
            IrOp::LoopJ,
            IrOp::ForthLocalGet(0),
            IrOp::ForthLocalSet(0),
            IrOp::ForthFLocalGet(0),
            IrOp::ForthFLocalSet(0),
            IrOp::Emit,
            IrOp::Dot,
            IrOp::Cr,
            IrOp::Type,
            IrOp::Execute,
            IrOp::SpFetch,
            IrOp::RpFetch,
            IrOp::FDup,
            IrOp::FDrop,
            IrOp::FSwap,
            IrOp::FOver,
            IrOp::FAdd,
            IrOp::FSub,
            IrOp::FMul,
            IrOp::FDiv,
            IrOp::FNegate,
            IrOp::FAbs,
            IrOp::FSqrt,
            IrOp::FMin,
            IrOp::FMax,
            IrOp::FFloor,
            IrOp::FRound,
            IrOp::FZeroEq,
            IrOp::FZeroLt,
            IrOp::FEq,
            IrOp::FLt,
            IrOp::FetchFloat,
            IrOp::StoreFloat,
            IrOp::StoF,
            IrOp::FtoS,
        ];
        let out = format_ir(&ops);
        assert_eq!(out.lines().count(), ops.len());
        // Every line non-empty, no accidental blank rendering.
        assert!(out.lines().all(|l| !l.trim().is_empty()));
    }
 }
@@ -453,6 +453,26 @@ fn programs() -> Vec<Program> {
            expected: "99 \n",
            category: Category::Definitions,
        },
        Program {
            name: "search-order-hides",
            code: "WORDLIST CONSTANT MY-WL\n\
                   MY-WL SET-CURRENT\n\
                   : SECRET 42 ;\n\
                   FORTH-WORDLIST SET-CURRENT\n\
                   [UNDEFINED] SECRET . CR\n\
                   GET-ORDER MY-WL SWAP 1+ SET-ORDER\n\
                   [DEFINED] SECRET . CR\n\
                   SECRET . CR\n\
                   -1 SET-ORDER\n\
                   [UNDEFINED] SECRET . CR",
            expected: "-1 \n-1 \n42 \n-1 \n",
            category: Category::Definitions,
        },
        // QUIT is deliberately absent from this corpus: what it abandons is
        // "the input source", and each engine here is fed differently (wafer
        // line by line, gforth from a file, sf64 from a prompting stdin), so
        // a comparison would measure the harness. Its semantics are pinned by
        // the QUIT tests in outer.rs, checked by hand against both engines.
        // -- Strings --
        Program {
            name: "s-quote-type",
@@ -624,6 +644,81 @@ fn compare_all_programs() {
    );
 }
 // -----------------------------------------------------------------------
 // Cross-engine behavioral comparison (requires SwiftForth sf64) -- WS-003
 // -----------------------------------------------------------------------
 /// Run Forth code through `SwiftForth`. Piped sf64 is quiet (no banner, no
 /// `ok` echo), truncates input lines at ~256 chars, and exits 243 after an
 /// error, so statements are fed one per line with a final `bye`.
 fn run_sf64_code(sf64: &str, code: &str) -> Option<EngineResult> {
    let mut input = String::new();
    for line in code.lines() {
        let t = line.trim();
        if !t.is_empty() {
            input.push_str(t);
            input.push('\n');
        }
    }
    input.push_str("bye\n");
    let out = run_via_stdin(sf64, &input)?;
    Some(EngineResult {
        output: String::from_utf8_lossy(&out.stdout).to_string(),
        success: out.status.success(),
    })
 }
 /// Correctness lane against `SwiftForth`: the same program corpus as the
 /// gforth comparison, sf64 as the oracle. Skips gracefully when sf64 is
 /// not installed (CI/linux). Programs listed in `SF64_SKIP` use words or
 /// output conventions `SwiftForth` does not share.
 #[test]
 #[ignore = "requires SwiftForth sf64 (run with -- --ignored)"]
 fn compare_all_programs_sf64() {
    // dot-quote: `."` outside a definition is a no-op in SwiftForth
    // (compile-only); WAFER supports the interpret-mode extension.
    const SF64_SKIP: &[&str] = &["dot-quote"];
    let Some(sf64) = find_sf64() else {
        eprintln!("SKIP: sf64 not found");
        return;
    };
    let progs = programs();
    let mut passed = 0;
    let mut skipped = 0;
    for prog in &progs {
        if SF64_SKIP.contains(&prog.name) {
            skipped += 1;
            continue;
        }
        let wafer = run_wafer(prog.code);
        assert!(wafer.success, "{}: WAFER execution failed", prog.name);
        let Some(sf) = run_sf64_code(sf64, prog.code) else {
            skipped += 1;
            continue;
        };
        if !sf.success {
            eprintln!("  WARN {}: sf64 execution failed, skipping", prog.name);
            skipped += 1;
            continue;
        }
        // SwiftForth prints numbers space-prefixed and echoes piped input
        // lines, so byte-exact comparison is meaningless; compare the
        // whitespace-token stream (the printed values and strings).
        let wafer_tokens: Vec<&str> = wafer.output.split_whitespace().collect();
        let sf_tokens: Vec<&str> = sf.output.split_whitespace().collect();
        assert_eq!(
            wafer_tokens, sf_tokens,
            "{}: output differs\n  WAFER: {:?}\n  sf64:  {:?}",
            prog.name, wafer.output, sf.output
        );
        passed += 1;
    }
    eprintln!(
        "\nsf64 behavioral comparison: {passed} passed, {skipped} skipped (of {})",
        progs.len()
    );
 }
 // -----------------------------------------------------------------------
 // Performance comparison (requires gforth)
 // -----------------------------------------------------------------------
@@ -651,37 +746,37 @@ fn perf_benchmarks() -> Vec<PerfBenchmark> {
            verify: "25 FIB",
            expected: 75025,
            samples: 5,
-            max_ratio: 0.65,
+            max_ratio: 0.17,
        },
        PerfBenchmark {
-            name: "Factorial(12)x10K",
+            name: "Factorial(12)x100K",
            define: ": FACT 1 SWAP 1+ 1 ?DO I * LOOP ; \
-                     : FACT-BENCH 10000 0 DO 12 FACT DROP LOOP ;",
+                     : FACT-BENCH 100000 0 DO 12 FACT DROP LOOP ;",
            run_code: "FACT-BENCH",
            verify: "12 FACT",
            expected: 479001600,
            samples: 5,
-            max_ratio: 0.75,
+            max_ratio: 0.12,
        },
        PerfBenchmark {
-            name: "GCD-bench(500)",
+            name: "GCD-bench(20K)",
            define: ": GCD BEGIN DUP WHILE TUCK MOD REPEAT DROP ; \
                     : GCD-BENCH 0 DO 10000 I 1+ GCD DROP LOOP ;",
-            run_code: "500 GCD-BENCH",
+            run_code: "20000 GCD-BENCH",
            verify: "48 36 GCD",
            expected: 12,
            samples: 5,
-            max_ratio: 0.70,
+            max_ratio: 0.45,
        },
        PerfBenchmark {
-            name: "NestedLoops(50)",
+            name: "NestedLoops(50)x1K",
            define: ": NESTED 0 SWAP 0 DO I 0 ?DO I J + DROP LOOP LOOP ; \
-                     : NESTED-BENCH 100 0 DO 50 NESTED DROP LOOP ;",
+                     : NESTED-BENCH 1000 0 DO 50 NESTED DROP LOOP ;",
            run_code: "NESTED-BENCH",
            verify: "5 NESTED",
            expected: 0,
-            samples: 3,
+            samples: 5,
-            max_ratio: 0.20,
+            max_ratio: 0.11,
        },
        PerfBenchmark {
            name: "Collatz(2K)",
@@ -693,7 +788,7 @@ fn perf_benchmarks() -> Vec<PerfBenchmark> {
            verify: "27 COLLATZ",
            expected: 111,
            samples: 3,
-            max_ratio: 0.45,
+            max_ratio: 0.08,
        },
    ]
 }
@@ -344,3 +344,32 @@ fn compliance_tools() {
    let errors = run_suite(&mut vm, "toolstest.fth");
    assert_eq!(errors, 0, "Programming-Tools: {errors} test failures");
 }
 /// The Forth 2012 Core suite against consolidated code.
 ///
 /// `CONSOLIDATE` recompiles the whole dictionary into one WASM module, which
 /// is where cross-word typed calls live: a word with a known stack effect
 /// gets a fast entry taking and returning its stack items as WASM values,
 /// and its `() -> ()` wrapper keeps the table slot. Nothing else covers that
 /// path for correctness, so run the suite on top of it.
 #[test]
 fn compliance_core_after_consolidate() {
    let mut vm = ForthVM::<NativeRuntime>::new().expect("Failed to create ForthVM");
    let tester_path = format!("{SUITE_DIR}/tester.fr");
    let f1 = load_file(&mut vm, &tester_path);
    assert_load_fails_within_baseline(&tester_path, f1);
    vm.evaluate("CONSOLIDATE").expect("CONSOLIDATE failed");
    vm.take_output();
    let core_path = format!("{SUITE_DIR}/core.fr");
    let f2 = load_file(&mut vm, &core_path);
    assert_load_fails_within_baseline(&core_path, f2);
    let _ = vm.evaluate("DECIMAL #ERRORS @");
    let errors = vm.data_stack().first().copied().unwrap_or(-1);
    assert_eq!(
        errors, 0,
        "Core word set after CONSOLIDATE: {errors} failures"
    );
 }
@@ -12,7 +12,7 @@ workspace = true
 crate-type = ["cdylib", "rlib"]
 [dependencies]
-wafer-core = { path = "../core", version = "0.1.0", default-features = false, features = ["crypto"] }
+wafer-core = { path = "../core", version = "0.2.7", default-features = false, features = ["crypto"] }
 wasm-bindgen = "0.2"
 js-sys = "0.3"
 send_wrapper = { workspace = true }
@@ -38,6 +38,23 @@ impl WebHostAccess {
    }
 }
 /// An exception on its way back out of compiled code. Host words rethrow the
 /// Forth message (`Stack underflow`, an `ABORT"` text, a `THROW` description),
 /// so surface exactly that and nothing else — the JS `Error` carries the whole
 /// engine stack in its message, which is noise to a Forth programmer. Anything
 /// without a message is a genuine runtime fault and keeps the call context.
 fn call_error(fn_index: u32, e: &JsValue) -> anyhow::Error {
    match Reflect::get(e, &"message".into())
        .ok()
        .and_then(|m| m.as_string())
        .and_then(|m| m.lines().next().map(str::trim).map(str::to_string))
        .filter(|m| !m.is_empty())
    {
        Some(msg) => anyhow::anyhow!("{msg}"),
        None => anyhow::anyhow!("call_func({fn_index}) failed: {e:?}"),
    }
 }
 impl HostAccess for WebHostAccess {
    fn mem_read_i32(&mut self, addr: u32) -> i32 {
        let view = js_sys::Int32Array::new(&self.buffer());
@@ -134,7 +151,7 @@ impl HostAccess for WebHostAccess {
            .dyn_into()
            .map_err(|_| anyhow::anyhow!("table entry {fn_index} is not a function"))?;
        func.call0(&JsValue::NULL)
-            .map_err(|e| anyhow::anyhow!("call_func({fn_index}) failed: {e:?}"))?;
+            .map_err(|e| call_error(fn_index, &e))?;
        Ok(())
    }
 }
@@ -406,7 +423,7 @@ impl Runtime for WebRuntime {
            .dyn_into()
            .map_err(|_| anyhow::anyhow!("table entry {fn_index} is not callable"))?;
        func.call0(&JsValue::NULL)
-            .map_err(|e| anyhow::anyhow!("call_func({fn_index}) failed: {e:?}"))?;
+            .map_err(|e| call_error(fn_index, &e))?;
        Ok(())
    }
@@ -18,11 +18,11 @@ confidence-threshold = 0.8
 [bans]
 multiple-versions = "deny"
 wildcards = "deny"
-# Transitive duplicates from wasmtime v31 -- will resolve when upgrading
+# Transitive duplicates from wasmtime v47 dependencies
 skip = [
    "getrandom",
    "syn",
    "hashbrown",
    "r-efi",
    "thiserror",
    "thiserror-impl",
    "wasm-encoder",
@@ -14,7 +14,7 @@ This document describes every optimization that makes sense for WAFER, why it ma
 | #  | Optimization               | Level        | Status      | Impact  |
 | -- | -------------------------- | ------------ | ----------- | ------- |
-| 1  | Stack-to-Local Promotion   | Codegen      | Phase 2     | Highest |
+| 1  | Stack-to-Local Promotion   | Codegen      | Phase 4     | Highest |
 | 2  | Peephole Optimization      | IR pass      | Done        | High    |
 | 3  | Constant Folding           | IR pass      | Done        | High    |
 | 4  | Inlining                   | IR pass      | Done        | High    |
@@ -29,12 +29,18 @@ This document describes every optimization that makes sense for WAFER, why it ma
 | 13 | Startup Batching           | Architecture | Done        | Low     |
 | 14 | Self-Recursive Direct Call | Codegen      | Done        | High    |
 | 15 | Float / Double-Cell        | Codegen      | Not started | Future  |
 | 16 | Typed Calling Convention   | Codegen      | Done        | Highest |
 ## 1. Stack-to-Local Promotion
-**Status: Phase 2 done.** Words with straight-line code, DO/LOOP, and IF/ELSE use WASM locals instead of memory stack. Stack manipulation ops (Swap, Rot, Nip, Tuck, Dup, Drop) emit zero WASM instructions. Loop index/limit kept in WASM locals (zero return stack traffic). Switchable via `WaferConfig::codegen.stack_to_local_promotion`.
+**Status: Phase 4 done.** Straight-line code, DO/LOOP, IF/ELSE and the BEGIN loop family use WASM locals instead of the memory stack, per region rather than per word. Stack manipulation ops (Swap, Rot, Nip, Tuck, Dup, Drop) emit zero WASM instructions. Loop index/limit stay in WASM locals (zero return stack traffic). Switchable via `WaferConfig::codegen.stack_to_local_promotion`.
-Phase 1 covered straight-line code only. Phase 2 extends to DO/LOOP (with stack-neutrality check) and IF/ELSE/THEN (with equal-branch-effect check). BEGIN loops and BeginDoubleWhileRepeat are not yet promoted.
+- **Phase 1** — straight-line code.
 - **Phase 2** — DO/LOOP (stack-neutrality check) and IF/ELSE/THEN (equal-branch-effect check).
 - **Phase 3** — _per region instead of per word_. Promotion used to be all-or-nothing: one `.`, `CR`, `>R` or host call anywhere in a definition put the entire body on the memory stack, hot loops included, which costs 2.2 ns per loop-carried add instead of 0.31 — the accumulator round-trips through store-to-load forwarding rather than staying in a register. `emit_body` now partitions a body into maximal promotable stretches and runs the simulator over each, loading what a region reads and writing back what it leaves. A region may only use `I` / `J` when the DO loops naming them are inside it, and a straight-line region needs at least three operations to pay for its prologue and epilogue; a loop always does.
 - **Phase 4** — `BEGIN..UNTIL`, `BEGIN..AGAIN` and `BEGIN..WHILE..REPEAT`, when the construct is provably stack-neutral: UNTIL's body nets +1 (the flag it consumes), AGAIN's nets 0, and for WHILE..REPEAT the test and the body must balance _separately_, because WHILE leaves the loop between them and a net that only added up over the pair would give the two exits different stack shapes. Bodies containing an `EXIT` stay out, the same rule DO/LOOP follows.
 Still not promoted: `BeginDoubleWhileRepeat`, `>R`/`R>`, floats, `{: :}` locals, `SP@`/`DEPTH`/`EXECUTE`, and the flat forward-block IR ops.
 ### The Problem
@@ -452,33 +458,59 @@ Fibonacci(25) with ~243K recursive calls:
 The optimization is implemented in `emit_op` for `IrOp::Call`: when `ctx.self_word_id == Some(word_id)`, emit `call WORD_FUNC` (function index 1 in the word's own module). The `self_word_id` is derived from `CodegenConfig::base_fn_index`.
 The numbers above are the state before section 16: they measure the call instruction, and what dominated turned out to be the calling _convention_ around it. A self-recursive word that is also typed now calls its own fast entry instead, and Fibonacci(25) is 356 microseconds rather than 1.6 ms.
 ## 15. Float and Double-Cell Stack
 **Status: Not started.** `PushI64` and `PushF64` exist as IR ops but are stubs in codegen. Float stack operations are currently all host functions.
 The float stack lives in its own memory region (0x2540--0x2D40). Float operations will have the same memory-based overhead as integer operations, but worse: `f64` values are 8 bytes, doubling the memory traffic per push/pop. Stack-to-local promotion (section 1) is even more impactful for floats because WASM has native `f64` locals and operand stack support.
 ## 16. Typed Calling Convention
 **Status: Done.** A word whose stack effect is statically known compiles to two entry points: a fast one with signature `(i32 x p) -> (i32 x q)`, carrying its stack items as WASM values, and the usual `( -- )` wrapper that moves those items on and off the memory data stack. The wrapper keeps the function-table slot, so `EXECUTE`, the outer interpreter, host words and `CATCH` see exactly the ABI they saw before; only direct calls inside a module take the fast entry. `WAFER_TYPED_CALLS=0` falls back.
 ### The Problem
 This is what the SwiftForth gap was made of. sf64 keeps TOS in `RBX` and the stack pointer in `RBP`, and both survive a `CALL` untouched, so its `FIB` is 16 instructions and about 7 memory touches per node. WAFER kept the whole stack in linear memory and flushed its cached `$dsp` to an imported global before every call: about 36 touches. Section 1's simulator, which already promoted loop and `IF` bodies into locals, refused any body containing a call or an `EXIT` -- exactly the words where the convention cost the most.
 ### The Effect Fixpoint
 Self-recursion makes the stack-effect equation circular (`d = k + m*d`), so the effect is solved by iterating a guess until it reproduces itself: `FIB` settles on `(1,1)` in two rounds, while `: F 1 RECURSE ;` never settles and stays untyped. `CONSOLIDATE` extends this across words, since it puts them all in one module: the effects are solved from the leaves outward, and 105 of 187 words in a booted dictionary end up typed.
 ### Impact
 Fibonacci(25) went from 1035 to 366 microseconds, 4.3x slower than `sf64` to 1.2x. Stack guards became nearly free as a side effect -- they hang off the memory-stack push/pop choke points, and a typed word barely has any -- so the default guards-on configuration that the REPL and the web build use went from 1631 to 365 microseconds on the same benchmark.
 Untyped by design: anything using `SP@`, `DEPTH`, `EXECUTE`, `>R`/`R>`, floats or locals; anything calling a word that is itself untyped, which in the JIT path means every call except `RECURSE`; mutually recursive words; and words whose effect is not static -- branches that disagree on depth, `EXIT` at the wrong depth, a non-neutral loop body, or a recursion that grows the stack per level.
 ## Current Performance vs Gforth
 All optimizations enabled, release mode, measured with UTIME:
 ```
-Benchmark                   WAFER     CONSOL     gforth      WAFER/gf
+Benchmark                   WAFER     CONSOL     gforth       sf64    WAFER/gf   WAFER/sf
-Fibonacci(25)                1629       1535       3422        0.45x
+Fibonacci(25)                 356        361       3389        287       0.11x      1.24x
-Factorial(12)x10K             340        339        638        0.53x
+Factorial(12)x100K            479        495       6249       1650       0.08x      0.29x
-GCD-bench(500)                 18         15         30        0.50x
+GCD-bench(20K)                540        559       1801        801       0.30x      0.67x
-NestedLoops(50)                84         73        720        0.10x
+NestedLoops(50)x1K            509        501       7023       1887       0.07x      0.27x
-Collatz(2K)                  1212       1202       3914        0.31x
+Collatz(2K)                   185        213       3873        610       0.05x      0.30x
 ```
-Times in microseconds. WAFER/gf < 1.0 means WAFER is faster.
+Times in microseconds. WAFER/gf < 1.0 means WAFER is faster. `sf64` is SwiftForth,
 which compiles to native code; two caveats on that column. The install here is an
 x86-64 binary under Rosetta 2 while WAFER and gforth are native arm64, so it is a
 native-vs-emulated comparison and a native SwiftForth would be faster than these
 numbers; and sf64 uses 64-bit cells to WAFER's 32-bit. WAFER is ahead on the four
 loop-heavy benchmarks and behind on Fibonacci, which is one call per node with no
 loop to promote.
 ## Remaining Opportunities
-| Optimization                     | Status              | Potential Impact                                      |
+| Optimization                     | Status              | Potential Impact                                                                                                                                                                                                                                                                                            |
-| -------------------------------- | ------------------- | ----------------------------------------------------- |
+| -------------------------------- | ------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
-| BEGIN loop promotion             | Not started         | Would speed up GCD-style tight loops further          |
+| Bounded self-inlining            | Not started         | Measured 1.33x on Fibonacci, the last benchmark behind sf64. Blocked on `EXIT`: the inliner refuses any body containing one, and a recursive Forth word is `... IF EXIT THEN ... RECURSE`. Needs either a scoped exit (compile an inlined `EXIT` as a branch to the end of a block) or guard-only expansion |
-| BeginDoubleWhileRepeat promotion | Not started         | Rare pattern, low priority                            |
+| BeginDoubleWhileRepeat promotion | Not started         | Rare pattern, low priority. Its promoted emitter exists but has no loop fixup and is unverified                                                                                                                                                                                                             |
-| LEAVE as IR primitive            | Not started         | Would enable fast-path for loops with LEAVE           |
+| LEAVE as IR primitive            | Not started         | Would enable fast-path for loops with LEAVE                                                                                                                                                                                                                                                                 |
-| Float stack-to-local             | Not started         | Eliminate float stack memory traffic                  |
+| Float stack-to-local             | Not started         | Eliminate float stack memory traffic                                                                                                                                                                                                                                                                        |
-| WASM tail calls proposal         | Waiting on wasmtime | Would eliminate stack growth for tail-recursive words |
+| WASM tail calls proposal         | Waiting on wasmtime | Would eliminate stack growth for tail-recursive words                                                                                                                                                                                                                                                       |
@@ -282,11 +282,13 @@ When the compiler encounters a word reference during compilation, it emits:
 (call_indirect (type $void) (table 0))    ;; indirect call through the table
 ```
-**Self-recursive optimization**: When a word calls itself (RECURSE), the codegen detects this and emits a direct `call` instead of `call_indirect`, eliminating the table lookup and signature check (~3x faster for recursive words like Fibonacci).
+**Self-recursive optimization**: When a word calls itself (RECURSE), the codegen detects this and emits a direct `call` instead of `call_indirect`, eliminating the table lookup and signature check (~3x faster for recursive words like Fibonacci). When the word is also typed, that direct call goes to its fast entry -- see below.
 **After CONSOLIDATE**: All `call_indirect` between words in the consolidated module are replaced with direct `call` instructions, giving similar benefits for cross-word calls.
-At runtime, wasmtime resolves the table entry and calls the target function. Because all functions share the same memory, globals, and table, state passes between words through the data stack in linear memory. There are no function parameters or return values at the WASM level -- everything goes through the stack.
+At runtime, wasmtime resolves the table entry and calls the target function. Because all functions share the same memory, globals, and table, state passes between words through the data stack in linear memory.
 **Typed entry points**: that last sentence is the default, not the whole story. A word whose stack effect is statically known also gets a _fast_ entry with signature `(i32 x p) -> (i32 x q)`, which takes its arguments as WASM values and returns its results the same way, so they stay in registers across the call instead of round-tripping through linear memory. The `( -- )` function above is then a wrapper around it, and it is the wrapper that keeps the table slot -- so `EXECUTE`, the outer interpreter, host words and `CATCH` see the memory ABI unchanged. Only a direct call inside the same module takes the fast entry: `RECURSE` in the JIT path, and every resolvable call after `CONSOLIDATE`. See [OPTIMIZATIONS.md](OPTIMIZATIONS.md) section 16.
 This is subroutine threading: each word is a subroutine, and calling a word is an indirect function call.
@@ -33,7 +33,10 @@ contexts:
    - include: compare
    - include: memory
    - include: io
    - include: pictured
    - include: string_ops
    - include: float
    - include: tools
    - include: dictionary
    - include: exception
    - include: parsing
@@ -95,27 +98,31 @@ contexts:
    # Quotations (Core-Ext 6.2.0455): [: ... ;] compiles an anonymous word.
    - match: '(?i)(?:^|(?<=\s))(\[:|;\]){{ident_break}}'
      scope: keyword.other.definition.forth
-    - match: '(?i)(?:^|(?<=\s))(VARIABLE|2VARIABLE|CONSTANT|2CONSTANT|VALUE|CREATE|DEFER|MARKER|BUFFER:|FCONSTANT|FVARIABLE)(\s+)(\S+)?'
+    - match: '(?i)(?:^|(?<=\s))(VARIABLE|2VARIABLE|CONSTANT|2CONSTANT|VALUE|CREATE|DEFER|MARKER|REMEMBER|BUFFER:|FCONSTANT|FVARIABLE)(\s+)(\S+)?'
      captures:
        1: keyword.other.defining.forth
        3: entity.name.constant.forth
-    - match: '(?i)(?:^|(?<=\s))(DOES>|IMMEDIATE|RECURSE|POSTPONE|COMPILE,|LITERAL|2LITERAL|FLITERAL|SLITERAL){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(DOES>|IMMEDIATE|RECURSE|POSTPONE|COMPILE,|LITERAL|2LITERAL|FLITERAL|SLITERAL|DEFER!|DEFER@){{ident_break}}'
      scope: keyword.other.defining.forth
  control:
    - match: '(?i)(?:^|(?<=\s))(IF|THEN|ELSE|BEGIN|UNTIL|WHILE|REPEAT|AGAIN|DO|\?DO|LOOP|\+LOOP|LEAVE|UNLOOP|EXIT|CASE|OF|ENDOF|ENDCASE|QUIT){{ident_break}}'
      scope: keyword.control.forth
    # Conditional compilation (Tools-ext 15.6.2).
    - match: '(?i)(?:^|(?<=\s))(\[IF\]|\[ELSE\]|\[THEN\]|\[DEFINED\]|\[UNDEFINED\]){{ident_break}}'
      scope: keyword.control.conditional-compilation.forth
  stack_ops:
    - match: '(?i)(?:^|(?<=\s))(DUP|\?DUP|DROP|SWAP|OVER|ROT|-ROT|NIP|TUCK|PICK|ROLL|2DUP|2DROP|2SWAP|2OVER|2ROT|DEPTH|SP@){{ident_break}}'
      scope: support.function.stack.forth
  return_stack:
-    - match: '(?i)(?:^|(?<=\s))(>R|R>|R@|2>R|2R>|2R@|N>R|NR>|I|J|CS-PICK|CS-ROLL){{ident_break}}'
+    # RP@ / RDEPTH are WAFER extensions (gforth-style return-stack access).
    - match: '(?i)(?:^|(?<=\s))(>R|R>|R@|2>R|2R>|2R@|N>R|NR>|I|J|CS-PICK|CS-ROLL|RP@|RDEPTH){{ident_break}}'
      scope: support.function.return-stack.forth
  arithmetic:
-    - match: '(?i)(?:^|(?<=\s))(\+|-|\*|/|MOD|/MOD|\*/|\*/MOD|NEGATE|ABS|MIN|MAX|1\+|1-|2\*|2/|M\*|M\+|M\*/|UM\*|UM/MOD|FM/MOD|SM/REM|S>D|D>S){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(\+|-|\*|/|MOD|/MOD|\*/|\*/MOD|NEGATE|ABS|MIN|MAX|1\+|1-|2\*|2/|M\*|M\+|M\*/|UM\*|UM/MOD|FM/MOD|SM/REM|S>D|D>S|D\+|D-|DNEGATE|DABS|DMAX|DMIN|D2\*|D2/){{ident_break}}'
      scope: keyword.operator.arithmetic.forth
  logic:
@@ -123,21 +130,36 @@ contexts:
      scope: keyword.operator.logical.forth
  compare:
-    - match: '(?i)(?:^|(?<=\s))(=|<>|<|>|<=|>=|U<|U>|0=|0<>|0<|0>){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(=|<>|<|>|<=|>=|U<|U>|0=|0<>|0<|0>|D<|D=|D0<|D0=|DU<|WITHIN){{ident_break}}'
      scope: keyword.operator.comparison.forth
  memory:
-    - match: '(?i)(?:^|(?<=\s))(@|!|C@|C!|\+!|2@|2!|ALLOT|HERE|ALIGN|ALIGNED|CELL\+|CELLS|CHAR\+|CHARS|UNUSED|MOVE|CMOVE|CMOVE>|FILL|ERASE|BLANK|ALLOCATE|FREE|RESIZE|PAD){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(@|!|C@|C!|\+!|2@|2!|C,|ALLOT|HERE|ALIGN|ALIGNED|CELL\+|CELLS|CHAR\+|CHARS|UNUSED|MOVE|CMOVE|CMOVE>|FILL|ERASE|BLANK|ALLOCATE|FREE|RESIZE|PAD){{ident_break}}'
      scope: support.function.memory.forth
  io:
-    - match: '(?i)(?:^|(?<=\s))(EMIT|CR|SPACE|SPACES|TYPE|\.|U\.|\.R|U\.R|D\.|D\.R|\?|KEY|KEY\?|PAGE|AT-XY|ACCEPT|EXPECT|\.S){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(EMIT|CR|SPACE|SPACES|TYPE|\.|U\.|\.R|U\.R|D\.|D\.R|\?|KEY|KEY\?|PAGE|AT-XY|ACCEPT|EXPECT|\.S|F\.S|\.RS){{ident_break}}'
      scope: support.function.io.forth
  # Pictured numeric output (6.1: <# # #S #> HOLD SIGN; HOLDS is Core-Ext).
  pictured:
    - match: '(?i)(?:^|(?<=\s))(<#|#>|#S|#|HOLD|HOLDS|SIGN){{ident_break}}'
      scope: support.function.pictured.forth
  # String word set (17.6).
  string_ops:
    - match: '(?i)(?:^|(?<=\s))(COUNT|COMPARE|-TRAILING|/STRING){{ident_break}}'
      scope: support.function.string.forth
  float:
-    - match: '(?i)(?:^|(?<=\s))(F\+|F-|F\*|F/|FNEGATE|FABS|FMAX|FMIN|FSQRT|FFLOOR|FROUND|FSINCOS|F=|F<|F0=|F0<|F~|FDUP|FDROP|FSWAP|FOVER|FROT|FNIP|FTUCK|FDEPTH|F@|F!|FE\.|FS\.|F\.|F>D|D>F|F>S|S>F|>FLOAT|REPRESENT|PRECISION|SET-PRECISION|FALIGNED|DFALIGNED|SFALIGNED|DF@|DF!|SF@|SF!){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(F\+|F-|F\*\*|F\*|F/|FNEGATE|FABS|FMAX|FMIN|FSQRT|FFLOOR|FROUND|FLOOR|FSINCOS|FSINH|FSIN|FCOSH|FCOS|FTANH|FTAN|FASINH|FASIN|FACOSH|FACOS|FATANH|FATAN2|FATAN|FEXPM1|FEXP|FLNP1|FLN|FLOG|FALOG|F=|F<|F0=|F0<|F~|FDUP|FDROP|FSWAP|FOVER|FROT|FNIP|FTUCK|FDEPTH|F@|F!|FE\.|FS\.|F\.|F>D|D>F|F>S|S>F|>FLOAT|REPRESENT|PRECISION|SET-PRECISION|FALIGN|FALIGNED|DFALIGN|DFALIGNED|SFALIGN|SFALIGNED|FLOAT\+|FLOATS|DFLOAT\+|DFLOATS|SFLOAT\+|SFLOATS|DF@|DF!|SF@|SF!){{ident_break}}'
      scope: support.function.float.forth
  # Interactive/debug tools (Tools word set + WAFER REPL additions).
  tools:
    - match: '(?i)(?:^|(?<=\s))(SEE-IR|SEE|DUMP|BYE|HELP){{ident_break}}'
      scope: support.function.tools.forth
  dictionary:
    - match: "(?i)(?:^|(?<=\\s))('|\\[']|,|>BODY|FIND|WORDS|ONLY|ALSO|PREVIOUS|DEFINITIONS|FORTH|GET-ORDER|SET-ORDER|GET-CURRENT|SET-CURRENT|WORDLIST|SEARCH-WORDLIST|FORTH-WORDLIST|ENVIRONMENT\\?|EXECUTE){{ident_break}}"
      scope: support.function.dictionary.forth
@@ -147,7 +169,7 @@ contexts:
      scope: keyword.control.exception.forth
  parsing:
-    - match: '(?i)(?:^|(?<=\s))(PARSE|PARSE-NAME|WORD|REFILL|EVALUATE|SOURCE|SOURCE-ID|>IN|BASE|STATE|>NUMBER|SEARCH|SUBSTITUTE|UNESCAPE|REPLACES|S){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(PARSE|PARSE-NAME|WORD|REFILL|EVALUATE|INCLUDE|INCLUDED|SOURCE|SOURCE-ID|>IN|BASE|DECIMAL|HEX|STATE|>NUMBER|SEARCH|SUBSTITUTE|UNESCAPE|REPLACES|S){{ident_break}}'
      scope: support.function.parsing.forth
  literals:
@@ -185,5 +207,5 @@ contexts:
  wafer_extras:
    # WAFER-specific extensions beyond the Forth 2012 standard.
    # When the language grows new user-facing non-standard words, add them here.
-    - match: '(?i)(?:^|(?<=\s))(CONSOLIDATE|RANDOM|RND-SEED|UTIME|READ-PASSWORD){{ident_break}}'
+    - match: '(?i)(?:^|(?<=\s))(CONSOLIDATE|RANDOM|RND-SEED|UTIME|READ-PASSWORD|EMPTY|GILD){{ident_break}}'
      scope: support.function.wafer-extra.forth
Author	SHA1	Message	Date
Oleksandr Kozachuk	645c2dadd7	Merge pull request from ok2/perf/typed-calls CI / check (push) Has been cancelled Details 0.2.7: typed calling convention, per-region and BEGIN loop promotion, and a fix for a promoted loop/IF that reordered the stack.	2026-08-09 17:53:00 +02:00
Oleksandr Kozachuk	3bb613ece0	release: 0.2.7 Version bump plus a doc sweep: the benchmark tables in README and docs/OPTIMIZATIONS.md were still from before the typed calling convention, OPTIMIZATIONS listed BEGIN loop promotion as not started, and the subroutine-threading section of docs/WAFER.md described the memory ABI as the only one.	2026-08-09 17:36:52 +02:00
Oleksandr Kozachuk	b8dcc021a2	perf(core): promote per region, promote BEGIN loops, keep loops off the memory stack Promotion was all-or-nothing per word, so one `.` or one host call put the whole body -- hot loops included -- on the memory data stack, where a loop-carried add costs 2.2 ns/iteration instead of 0.31. The stack simulator now runs over each promotable stretch of a word; BEGIN/UNTIL, BEGIN/AGAIN and BEGIN/WHILE/REPEAT join DO/LOOP as promotable when the construct is provably stack-neutral; and the inliner no longer moves a loop-bearing callee into a caller that can never be promoted. Fixes a bug the BEGIN work uncovered, present since promotion was introduced and shipped in 0.2.6: the loop fixup and the IF join copied locals one slot at a time in index order, so a body that permutes the stack lost a value -- `: C 3 4 2 0 DO SWAP LOOP . . ;` printed `4 4` where gforth prints `4 3`. Four of five benchmarks now beat sf64: Factorial 0.29x, Collatz 0.30x, NestedLoops 0.27x, GCD 0.67x. Only Fibonacci is behind, at 1.24x. Also scale GCD, Factorial and NestedLoops, which ran in 14-51 us where scatter and fixed costs dominated -- that is what exposed GCD as a loss and pointed at BEGIN. WS-014, WS-015, WS-016, WS-019.	2026-08-09 17:25:21 +02:00
Oleksandr Kozachuk	fc34bd9b24	perf(core): typed calling convention for words with a known stack effect Such a word now compiles to a fast entry (i32 x p) -> (i32 x q) carrying its stack items as WASM values, plus the usual ( -- ) wrapper that keeps the table slot, so EXECUTE / interpreter / host words / CATCH see the unchanged memory ABI. Fib(25) 1035 -> 366 us, 4.3x slower than sf64 -> 1.2x; the default guards-on config 1740 -> 361 us. WS-006.	2026-08-09 09:20:10 +02:00
Oleksandr Kozachuk	e6c10a6fa1	Merge pull request #6 from ok2/fix/abort-reporting CI / check (push) Has been cancelled Details fix(core): silent ABORT, and name the compile-only condition	2026-08-07 13:11:50 +02:00
Oleksandr Kozachuk	e110ca9516	fix(core): silent ABORT, and name the compile-only condition Two reporting bugs found from the browser shell. An uncaught ABORT printed 'ABORT (throw -1)'. The standard defines ABORT as 'empty the data stack and perform the function of QUIT', and QUIT displays no message; gforth and SwiftForth are both silent. It now takes the same silent path QUIT got in 0.2.5. CATCH still reports -1 and still restores the stack depth, and ABORT" still prints its text -- different word, different code (-2). Compile-only constructs used in interpretation state claimed to be an 'unknown word', which is misleading for a word the system obviously knows: ABORT", IF, THEN, LOOP, LITERAL, RECURSE and friends. They now report 'interpreting a compile-only word: <name> (throw -14)', the standard condition both reference engines give. The check reuses the existing INTERPRETER_TOKENS table at the point where interpretation has already failed, so a genuine typo still reports 'unknown word'. Ships as v0.2.6.	2026-08-07 13:10:42 +02:00
Oleksandr Kozachuk	8e2fd0d7d4	Merge pull request #5 from ok2/feature/quit CI / check (push) Has been cancelled Details feat(core): QUIT	2026-08-07 12:34:05 +02:00
Oleksandr Kozachuk	69309006a2	feat(core): QUIT The CORE word was missing. QUIT empties the return stack, enters interpretation state, restores SOURCE-ID to the user input device and returns to the interpreter without a message, leaving the data stack untouched -- that last part is the whole difference to ABORT, which the standard defines as 'empty the data stack, then QUIT'. Implemented on the throw plumbing with the standard code -56, so nested EVALUATE / INCLUDE frames unwind and are abandoned on the way out. Two places treat -56 specially: CATCH lets it through (QUIT is a return to the prompt, not an exception) and evaluate() turns it into a silent Ok after the compile-state wipe it already performs. Semantics checked against gforth 0.7.3 and SwiftForth sf64, which agree: the data stack survives, nothing is printed, the rest of the input is abandoned, and '1 2 ' QUIT CATCH .' prints nothing while leaving 1 2. Six tests in outer.rs pin it. Deliberately NOT added to the cross-engine corpus: what QUIT abandons is the input source, and the three engines are fed differently there, so a comparison would measure the harness. The gap survived because the Forth 2012 suite skips QUIT by its own admission, and HELP's coverage lint compares dictionary against docs -- a word missing from both looks complete. docs/wafer-anki.txt had been documenting QUIT as if it existed. ABORT itself was already correct: executed while a definition is open it clears both stacks and returns to interpretation state. Ships as v0.2.5.	2026-08-07 12:28:11 +02:00
Oleksandr Kozachuk	9b10723a95	Merge pull request #4 from ok2/fix/web-error-messages CI / check (push) Has been cancelled Details fix(web): surface Forth messages from host-word throws	2026-08-06 20:46:11 +02:00
Oleksandr Kozachuk	15f8005b6d	Merge pull request #3 from ok2/fix/release-strip-breaks-proc-macros fix(build): exempt build scripts and proc-macros from release strip	2026-08-06 20:46:08 +02:00
Oleksandr Kozachuk	4769987b20	fix(web): surface Forth messages from host-word throws A host word signals failure by throwing across the JS boundary, and the browser runtime reported that exception with its Debug form, so an empty-stack RESIZE surfaced as call_func(134) failed: JsValue(Error: Stack underflow ...) with the engine's JS stack trace glued on. The thrown message IS the Forth message, so take it verbatim: 'Stack underflow', the same text the native CLI prints. Exceptions without a message keep the call context -- those are genuine runtime faults, not Forth throws. CATCH is unaffected: it reads the throw code from its own channel rather than parsing messages. Verified against a fresh VM in Node (initSync + WaferRepl): host-word underflow, compiled-guard underflow, THROW, unknown word and ' RESIZE CATCH . all match the native CLI. Ships as v0.2.4.	2026-08-06 20:45:27 +02:00
Oleksandr Kozachuk	d55a27873e	fix(build): exempt build scripts and proc-macros from release strip `wasm-pack build --release` died with "can't find crate" for rustversion, then thiserror_impl, then every other proc-macro. Cargo strips debuginfo from release artifacts by default and on macOS that takes the metadata proc-macro dylibs need to be loadable with it, so rustc could no longer open them. Debug builds are unstripped, which is why the whole test suite stayed green while the browser REPL could not be built for production at all. Stripping buys nothing for build scripts and proc-macros, so [profile.release.build-override] exempts them; release binaries stay stripped. Also pins wafer-core to 0.2.3 in wafer-web and wafer-cli — both still asked for 0.2.1. The caret requirement resolved, so nothing broke.	2026-08-06 20:16:41 +02:00
Oleksandr Kozachuk	645b00d6e8	Merge pull request #2 from ok2/feature/swiftforth-number-conversion feat(core): SwiftForth input number conversion, DPL and NH	2026-08-06 19:57:04 +02:00
Oleksandr Kozachuk	9efb92ddc8	docs(core): correct sign handling note in number conversion docs The doc comments still claimed a leading + binds as a sign. It does not: sf64 converts +7 as the double 7 with DPL 1, and the code follows that. Only a leading - is a sign.	2026-08-06 19:25:48 +02:00
Oleksandr Kozachuk	706c73ce2a	feat(core): SwiftForth input number conversion, DPL and NH Punctuation (`,` `.` `+` `/` `:` and an embedded `-`) after the leftmost digit now forces double-cell conversion, so `12.34`, `1,234`, `12:30:45` and `2026-08-06` convert as doubles. Only a trailing `.` worked before, and `1.5` was an "unknown word" error. The punctuation is a double-cell marker, not a fractional point, so the scale has to travel separately: DPL carries the digit count right of the rightmost punctuation character (negative when there was none), which is what lets `<# #>` place the point back on output. NH carries the high cell a single-cell conversion drops, so a token that overflows a cell is still recoverable as a double. parse_number and parse_double_number duplicated the prefix and sign handling and could not share a DPL counter, so they collapse into one parse_numeric_literal that reports which kind it converted. Verified token-for-token against sf64. One deliberate divergence: WAFER keeps accepting a sign before a base prefix (`-$FF`), which sf64 rejects.	2026-08-06 19:19:41 +02:00
Oleksandr Kozachuk	a89d7ca704	chore(ci): dprint-format changelog; dedupe sha crates; deny skips for wasmtime 47 CI / check (push) Has been cancelled Details	2026-08-06 16:15:02 +02:00
Oleksandr Kozachuk	20b8754e27	chore(release): v0.2.1 — changelog + version bump CI / check (push) Has been cancelled Details	2026-08-06 16:05:02 +02:00
Oleksandr Kozachuk	17852ed459	fix(core): search order is authoritative; host words validate stack args - Dictionary::find no longer falls back to the newest entry across all wordlists when the search order has no match (Forth 2012 16.3.3; gforth and SwiftForth agree). Cross-engine corpus program guards it. - ~40 argument-taking host words (RND-SEED, ACCEPT, RESIZE, ALLOCATE, SEARCH, SUBSTITUTE, ROLL, M*, UM/MOD, SF@/SF!/DF@/DF!, F./FE./FS./F~, 2R@, ...) popped or read stack cells with no underflow check; on an empty stack the pointer silently drifted past its base. New host_need/ host_fneed/host_fpop checked helpers; class-wide regression test drives every word on an empty stack.	2026-08-06 16:04:58 +02:00
Oleksandr Kozachuk	e6eabb098d	Merge pull request #1 from ok2/usability CI / check (push) Has been cancelled Details v0.2.0 — usability release: guards, SEE/HELP, INCLUDE, error overhaul	2026-08-06 12:48:00 +02:00
Oleksandr Kozachuk	f8da87187f	chore(release): v0.2.0 — changelog, version bump, dependency upgrades	2026-08-06 12:44:37 +02:00
Oleksandr Kozachuk	0645734d94	chore(tools): sync bat syntax with current word set Alternations diffed against live WORDS output (304 words) plus outer-interpreter tokens. Adds float transcendentals, double-cell ops, pictured numeric, conditional compilation, string ops, SEE/SEE-IR/DUMP/BYE/HELP, RP@/RDEPTH/.RS, REMEMBER/EMPTY/GILD, DECIMAL/HEX, INCLUDE/INCLUDED, WITHIN, DEFER!/DEFER@, C,.	2026-08-06 12:44:36 +02:00
Oleksandr Kozachuk	f83c8f25e4	build: add just install recipe Installs bat Forth syntax, then cargo install --locked the CLI. CARGO_PROFILE_RELEASE_STRIP=none because Cargo's release default (strip = "debuginfo") emits dylibs macOS 27 dyld rejects with "mis-aligned LINKEDIT string pool"; proc macros then fail to load during the build.	2026-08-06 12:44:34 +02:00
Oleksandr Kozachuk	9b1cc0cace	feat(core): INCLUDE, error overhaul, sf64 lane, WORDS ALL, .RS WS-012 -- INCLUDE/INCLUDED: - Injected source loader (core stays IO-free: CLI installs a filesystem reader, web leaves it unset -> defined error). Recursive include_file feeds files line-by-line through evaluate, so compile state and SEE capture span lines for free. Cycle detection, depth cap 16, paths relative to the including file, SOURCE-ID per nesting level, parent input restored on success/error/BYE. - CLI file mode now runs through the include machinery: `wafer x.fth` gets file:line error context and a base dir for nested INCLUDEs. - Unlocks the REMEMBER+INCLUDE reload loop. WS-008 -- error reporting remainder: - Errors inside included files carry `file.fth:12:` context (anyhow context chain; CLI prints {e:#}). - describe_uncaught now returns typed WaferError::UncaughtThrow { code, message } -- display text unchanged, THROW code reachable via downcast for CLI/web consumers. - compile_word emits a WASM name section; wasmtime trap backtraces name the faulting word and runtime_native prefixes "in <WORD>:". Batch/consolidated modules stay unnamed (no name plumbing there; boot primitives rarely trap). WS-003 -- SwiftForth correctness lane: - compare_all_programs_sf64 runs the program corpus with sf64 as oracle; whitespace-token comparison (sf64 prints numbers space-prefixed and echoes piped lines). 34/35 parity; dot-quote skipped (interpret-mode ." is a SwiftForth no-op). #[ignore]d like the gforth lane; `just compare-correctness` runs both. WS-011 leftovers: - WORDS ALL: grouped full view -- one section per wordlist (search order first), then internal words, each with counts. Backed by Dictionary::visible_entries (name, wid, internal); visible_words now derives from it. - .RS / RDEPTH: return-stack introspection in boot.fth over a new RP@ primitive (IrOp::RpFetch); BEGIN/WHILE walk so the walk never touches the stack it prints. SPACES clamped per 6.1.2230. 549 unit + 11 compliance + 9(+2) comparison + 5 crypto + 1 bench green; fmt/clippy clean; --no-default-features and wasm32 web checks pass.	2026-08-06 12:44:33 +02:00
Oleksandr Kozachuk	dc6e0d45e1	feat(core): SEE, SEE-IR, HELP introspection trio (WS-010) Implements plans/01-see-introspection.md, all phases. - see.rs: feature-free IR pretty-printer (format_ir/format_ir_with), exhaustive over IrOp -- a new variant fails the build, not the output. - SEE-IR <name>: post-optimization IR view with resolved callee names, immediate/does> annotations; host-word and interpreter-token stubs. - SEE <name>: verbatim source capture for colon words (multi-line, comments preserved, EVALUATE-nesting safe, error-path wiped, MARKER/ REMEMBER/EMPTY roll word sources back too). Data definers (VARIABLE/ CONSTANT/CREATE/BUFFER:/2/F/SYNONYM) record synthesized one-liners at definition time; VALUE/2VALUE/FVALUE/DEFER synthesize at SEE time so current values and IS targets show. Fallback chain ends at IR dump or host-word stub -- SEE never dead-ends on a defined word. - HELP [<name>]: wordhelp.rs doc table with stack effect + one-line description for EVERY word in a fresh VM (300+ dictionary words plus all outer-interpreter tokens); a coverage test fails the build if a word is ever added undocumented. User words echo their leading ( ... -- ... ) comment. SEE/SEE-IR prepend the HELP line as a \ comment. Bare HELP prints usage. - boot.fth colon definitions get real sources for free (they flow through evaluate); INTERPRETER_TOKENS gained the missing ?DO. 524 unit + 11 compliance + 9 comparison + 5 crypto + 1 bench green; fmt/clippy clean; core still builds --no-default-features; web wasm-pack build unchanged.	2026-08-06 12:44:32 +02:00