7b92719244
First iteration of the mut-local milestone (foundation step on the
Stateful-islands roadmap path). Lands the schema + surface tier:
Term::Mut, Term::Assign, and the nested MutVar struct become
first-class AST nodes that round-trip cleanly through Form A.
Typecheck and codegen recognition are deferred to mut.2 and mut.3
per the spec's out-of-iteration boundary; reaching either dispatch
entry point with these variants produces CheckError::Internal /
CodegenError::Internal with a 'deferred to iter mut.{2,3}' message.
Concretely:
- crates/ailang-core/src/ast.rs: two new Term variants behind
#[serde(tag = 't')]; pub struct MutVar { name, ty, init } adjacent
to Arm. Two canonical-bytes pin tests for the explicit-empty-vars
serialisation and the assign round-trip.
- ~25 substantive Term-walker arms across ailang-core/desugar,
ailang-core/workspace, ailang-check (lib + lift + linearity + mono
+ pre_desugar_validation + reuse_shape + uniqueness),
ailang-codegen (escape + lambda + lib), ailang-prose, and
crates/ail/src/main.rs. Universal policy: substantive recurse-into-
children at every site; only the two dispatch entry points
(synth in ailang-check, lower_term in ailang-codegen) stub with
Internal-error. One test-side walker arm in
crates/ail/tests/codegen_import_map_fallback_pin.rs not
enumerated by the plan was added as well (defensive recursion).
- ailang-surface: parse_mut + parse_assign helpers; Term::Mut
body desugared from a flat statement sequence into a right-folded
Term::Seq chain inside the JSON-AST. Print arms in print.rs match
the parser convention. EBNF prologue + crates/ailang-core/specs/
form_a.md productions updated. Four new parser pin tests cover
the empty-mut, single-var, body-required, and vars-only-no-body
cases.
- Drift + coverage tests extended: design_schema_drift.rs adds two
exemplars + match arms; schema_coverage.rs adds two VariantTag
entries + EXPECTED_VARIANTS + visit_term arms; spec_drift.rs adds
two exemplars + match arms. DESIGN.md §'Term (expression)' gets
jsonc-blocked schemas for the two new variants.
- examples/mut.ail: six-fn round-trip fixture exercising empty mut,
single-var, two-var, nested-shadow, and the four supported scalar
return types (Int, Float, Bool, Unit). The round_trip auto-glob
and schema_coverage corpus walker both pick it up.
Plan deviation: the plan named lib.rs:2572 as the typecheck
dispatch stub site, but that line is actually verify_tail_positions
(substantive walker). The real dispatch is synth (3403-area, stub
at 3489); the orchestrator routed correctly.
Tests: 564 → 579 green; cargo build green; round-trip green for
the new fixture; all drift + coverage tests green.
Journal: docs/journals/2026-05-15-iter-mut.1.md.
Refs: docs/specs/2026-05-15-mut-local.md, docs/plans/2026-05-15-iter-mut.1.md.
135 lines
5.4 KiB
Rust
135 lines
5.4 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)
|
|
}
|
|
// Iter mut.1: a `Term::Mut` cannot itself host a
|
|
// `show_user_adt.show__<T>` reference (its body is a
|
|
// mut-block, not a synthesised polymorphic call), but
|
|
// recurse defensively so any nested reference inside a
|
|
// var init / body / assign-value still surfaces.
|
|
Term::Mut { vars, body } => {
|
|
vars.iter().any(|v| contains_xmod_show_var(&v.init))
|
|
|| contains_xmod_show_var(body)
|
|
}
|
|
Term::Assign { value, .. } => contains_xmod_show_var(value),
|
|
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
|
|
);
|
|
}
|