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.
This commit is contained in:
@@ -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(())
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user