77b28ad64d
First half of the form-a-default-authoring milestone-close iter (Boss-decided strategy C, big-bang). All five tasks DONE; cargo test --workspace green at every per-task boundary. T1 — Add three new tests: - parse_is_deterministic_over_every_ail_fixture (round_trip.rs) - cli_parse_then_render_then_parse_is_idempotent (roundtrip_cli.rs) - carve_out_inventory.rs (new file; #[ignore]'d until T8 deletion) T2 — Bulk-render the 99 missing examples/<stem>.ail files via `ail render`. Corpus 58 .ail (pre-iter) -> 157 .ail. Eight .ail.json carve-outs (7 §C4(a) subject-matter + 1 §C4(b) prelude) preserved. One re-loop triggered: load_workspace prefers .ail siblings since ext-cli.1, so the newly-rendered imports broke seven Group-A entries whose JSON entry-paths now resolved imports to fresh .ail. Repair: pre-emptive forward-pull of five T3 migrations + 4 transient #[ignore]s on workspace.rs mod tests (cleanly relocated in T5). T3 — 14 Group-A test files migrated from ailang_core::load_workspace to ailang_surface::load_workspace + .ail paths. Carve-out lines preserved verbatim (7 sites in typeclass_22b2.rs / typeclass_22b3.rs). T4 — 12 Group-B test files: bulk regex flip on build_and_run / build_and_run_with_alloc / build_and_run_with_rc_stats call sites (~70 e2e.rs invocations + 11 subprocess sites). Four files mis-classified Group-A as Group-B in plan recon (mono_hash_stability, prelude_free_fns, print_mono_body_shape, show_mono_synthesis); two files mis-classified Group-B as Group-A (mono_recursive_fn, mono_xmod_qualified_ref). Migrated per actual shape, not plan label. T5 — Relocated #[cfg(test)] mod tests from production source to integration test crates with ailang-surface dev-dependency: - crates/ailang-core/tests/hash_pin.rs (10 tests from hash.rs) - crates/ailang-core/tests/workspace_pin.rs (10 non-carve-out tests from workspace.rs) - crates/ailang-codegen/tests/eq_primitives_pin.rs (3 tests from codegen/src/lib.rs:3717-3799) - ailang-prose/tests/snapshot.rs migrated (helper + 8 fixtures) to .ail + ailang_surface::load_module Carve-out tests in workspace.rs mod tests preserved in-place (3× 22b2 + 3× ct1 = 6 tests). Tempdir-based loader-mechanism tests (3 sites) also preserved — they don't consume examples/. Tests: 560 passed, 0 failed, 4 ignored (was 558 + 3 T1 new - 1 transit carve_out_inventory #[ignore] = 560 active). Tasks 6-12 (bench-driver suffix flips, e2e diff-test rewrite + 4 additional raw-JSON-inspect handlers, .ail.json deletion, retiring obsolete roundtrip tests + schema_coverage corpus flip, §C3 DESIGN.md restatement, §A4 doctrine edits, WhatsNew + roadmap strike) ship in the next dispatch on this iter ID. Known debt inherited to T6-12: 4 raw-JSON-inspect tests in e2e.rs (borrow_own_demo / reuse_as_demo / render_parse_round_trip_canonical / ail_run_accepts_ail_source_with_same_stdout_as_ail_json dual-form smoke) need rewrite or #[ignore] before T8 deletion; recorded in journal Concerns + Known debt sections.
125 lines
4.9 KiB
Rust
125 lines
4.9 KiB
Rust
//! Pin for the iter-24.3 codegen `import_map`-fallback path
|
|
//! (DESIGN.md §"Cross-module references in synthesised bodies"
|
|
//! invariant 2).
|
|
//!
|
|
//! Property protected: post-mono synthesised body cross-module
|
|
//! references resolve at codegen via the fallback to
|
|
//! `module_user_fns` / `module_def_ail_types` when the prefix is
|
|
//! NOT in the current module's `import_map`. Specifically, the
|
|
//! synthesised `prelude.print__<UserType>` body references
|
|
//! `<user_module>.show__<UserType>` even though `prelude` does not
|
|
//! import user modules.
|
|
//!
|
|
//! Failure mode this pin catches: a future codegen refactor
|
|
//! tightens `resolve_top_level_fn` or `lower_app`'s cross-module
|
|
//! arm or `synth_with_extras`'s Var arm back to `import_map`-only.
|
|
//! Without this pin, the regression surfaces only at the
|
|
//! `show_user_adt` E2E (which builds + runs a binary, slow to
|
|
//! bisect).
|
|
|
|
use ailang_check::{check_workspace, monomorphise_workspace};
|
|
use ailang_core::ast::{Def, Term};
|
|
use ailang_surface::load_workspace;
|
|
use std::path::PathBuf;
|
|
|
|
fn fixture_path() -> PathBuf {
|
|
PathBuf::from(env!("CARGO_MANIFEST_DIR"))
|
|
.join("../../examples")
|
|
.join("show_user_adt.ail")
|
|
}
|
|
|
|
#[test]
|
|
fn synthesised_print_uses_user_module_show_via_fallback() {
|
|
// Step 1: workspace loads + typechecks clean.
|
|
let ws = load_workspace(&fixture_path()).expect("workspace loads");
|
|
let diags = check_workspace(&ws);
|
|
assert!(
|
|
diags.is_empty(),
|
|
"typecheck diagnostics in show_user_adt fixture: {diags:?}"
|
|
);
|
|
|
|
// Step 2: mono synthesis produces `prelude.print__<IntBox>` whose
|
|
// body references `show_user_adt.show__<IntBox>` (cross-module).
|
|
let post_mono = monomorphise_workspace(&ws).expect("mono green");
|
|
let prelude_mod = post_mono
|
|
.modules
|
|
.get("prelude")
|
|
.expect("prelude post-mono module present");
|
|
|
|
let print_def = prelude_mod
|
|
.defs
|
|
.iter()
|
|
.find_map(|d| match d {
|
|
Def::Fn(f) if f.name.starts_with("print__") => Some(f),
|
|
_ => None,
|
|
})
|
|
.expect("synthesised print__<UserType> not found in prelude post-mono module");
|
|
|
|
// Step 3: recursively walk `print_def.body` looking for a Var
|
|
// whose name carries the `show_user_adt.` prefix (the cross-
|
|
// module reference invariant 2 protects).
|
|
fn contains_xmod_show_var(t: &Term) -> bool {
|
|
match t {
|
|
Term::Var { name } => {
|
|
name.starts_with("show_user_adt.") && name.contains("show__")
|
|
}
|
|
Term::Let { value, body, .. } => {
|
|
contains_xmod_show_var(value) || contains_xmod_show_var(body)
|
|
}
|
|
Term::LetRec { body, in_term, .. } => {
|
|
contains_xmod_show_var(body) || contains_xmod_show_var(in_term)
|
|
}
|
|
Term::App { callee, args, .. } => {
|
|
contains_xmod_show_var(callee) || args.iter().any(contains_xmod_show_var)
|
|
}
|
|
Term::Do { args, .. } => args.iter().any(contains_xmod_show_var),
|
|
Term::Lam { body, .. } => contains_xmod_show_var(body),
|
|
Term::If { cond, then, else_ } => {
|
|
contains_xmod_show_var(cond)
|
|
|| contains_xmod_show_var(then)
|
|
|| contains_xmod_show_var(else_)
|
|
}
|
|
Term::Match { scrutinee, arms } => {
|
|
contains_xmod_show_var(scrutinee)
|
|
|| arms.iter().any(|a| contains_xmod_show_var(&a.body))
|
|
}
|
|
Term::Ctor { args, .. } => args.iter().any(contains_xmod_show_var),
|
|
Term::Seq { lhs, rhs } => {
|
|
contains_xmod_show_var(lhs) || contains_xmod_show_var(rhs)
|
|
}
|
|
Term::Clone { value } => contains_xmod_show_var(value),
|
|
Term::ReuseAs { source, body } => {
|
|
contains_xmod_show_var(source) || contains_xmod_show_var(body)
|
|
}
|
|
Term::Lit { .. } => false,
|
|
}
|
|
}
|
|
|
|
assert!(
|
|
contains_xmod_show_var(&print_def.body),
|
|
"synthesised print body should contain a `show_user_adt.<suffix>` Var \
|
|
referencing the user-module's show__<IntBox> mono symbol — \
|
|
this is the cross-module reference codegen resolves via the \
|
|
import_map-fallback path. Body: {:?}",
|
|
print_def.body
|
|
);
|
|
|
|
// Step 4: confirm prelude module's `imports` does NOT contain
|
|
// `show_user_adt` — the resolution at codegen time genuinely
|
|
// bypasses the source template's import_map.
|
|
let prelude_src = ws
|
|
.modules
|
|
.get("prelude")
|
|
.expect("prelude source module present");
|
|
assert!(
|
|
prelude_src
|
|
.imports
|
|
.iter()
|
|
.all(|imp| imp.module != "show_user_adt"),
|
|
"prelude must not import show_user_adt (the invariant is that \
|
|
codegen resolves the cross-module ref WITHOUT going through \
|
|
import_map). Got imports: {:?}",
|
|
prelude_src.imports
|
|
);
|
|
}
|