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:
@@ -624,6 +624,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)
|
||||
// -----------------------------------------------------------------------
|
||||
|
||||
Reference in New Issue
Block a user