5170b6abd1
Closes Gitea #1. Realises the "P2 follow-up" called out in examples/prelude.ail:9 — removes the surface comparator names `==` / `!=` / `<` / `<=` / `>` / `>=` from the language entirely, routes the LLM-author's `(app eq …)` / `(app compare …)` / `(app ne|lt|le|gt|ge …)` through prelude.Eq / prelude.Ord class- dispatch, ships six named Float-comparison fns (`float_eq`/`float_ne`/`float_lt`/`float_le`/`float_gt`/`float_ge`) so Float keeps comparability without an Eq/Ord instance, and emits primitive instance bodies with `alwaysinline` so the -O0 IR shape stays at one instruction per comparison. Plan-task journal (13 tasks, single atomic iter per Approach A): Task 1 — Bootstrap: 4 new fixtures (eq_user_adt_smoke.ail, eq_float_must_fail.ail, float_compare_smoke.ail, operator_unbound_check.ail) + 5 new E2E/pin tests as RED starting state. All 5 confirmed RED at start: north-star fixed `NoInstance Eq Unit` (preserved by Unit-eq opening line intentionally added in plan-self-review); float_compare unknown `float_eq`; operator-name typechecked (== still polymorphic); must-fail diagnostic lacked `float_eq`; alwaysinline absent from IR. Task 2 — Codegen alwaysinline + intercept arms: introduced `intercept_emit_wants_alwaysinline` allowlist + appended ` alwaysinline` between `)` and `{` of the `define` line in `emit_fn`; added 9 new intercept arms to `try_emit_primitive_instance_body` — `eq__Int`/`eq__Bool`/ `eq__Unit` + the six `float_*` arms. Task 3 — Prelude reshape: `instance Eq Unit` added; Eq Int/Bool bodies become placeholder-`false` (intercept overrides); six `float_*` free fns added; line-9 P2-follow-up comment removed. Lockstep hash re-pins: prelude_module_hash_pin (3abe0d3fa3c11c99 → new), mono_hash_stability six body-hash literals (eq__Int/Bool/Str + compare__Int/Bool/Str all shifted because placeholder body changes the canonical hash). IR-snapshot regen (hello/list/max3/sum/ws_main) rolled forward into this task at orchestrator's pragmatic call — prelude shift forces the snapshots immediately. Task 4 — Fixture migration: 58 .ail fixtures rewritten (`(app == …)` → `(app eq …)`, etc.; Float-typed operand sites to `(app float_eq …)` / `(app float_lt …)`). eq_ord_user_adt.ail:21 inner `==` → `eq` migration with lockstep eq_ord_e2e.rs:134 body-hash re-pin (3c4cf040cb4e8bb2 → new). Two prose snapshots accepted; deps test + 5 hash_pin literals updated as cascading consequences. Task 5 — Test-scaffold migration: all 8 in-source `#[cfg(test)] mod tests` AST-literal sites threaded (desugar.rs:2414, check/lib.rs:5656/6092/6220, codegen/lib.rs sites). 7 obsolete in-source tests deleted (5 eq_typechecks + 2 lower_eq ADT/Fn rejection — coverage moves to E2E eq_user_adt_smoke + eq_float_must_fail). 2 additional letrec tests deleted (single-module check env can't resolve eq/ge without prelude auto-import; covered by workspace E2E). Task 6 — Lit-pattern desugar: build_eq emits `Term::Var { name: "eq" }` instead of `"=="` at desugar.rs:1109; doc-comment rewritten to describe class-dispatch. Task 7 — Dead-machinery deletion sweep (compile-gated): typchecker builtins (install + list comparator entries deleted); codegen builtin_binop_typed (10 comparator arms deleted from synth.rs, table reduced to arithmetic core); lower_eq fn entirely deleted; `==` short-circuit in lower_app deleted; `is_static_callee` `==` clause deleted; `is_arithmetic_or_comparison_op` renamed to `is_arithmetic_op` + caller-update at codegen/lib.rs:2152 + :2529. Dead `poly_a_a_to_bool` helpers also removed. Workspace build green after compile gate — every caller of the deleted surface was migrated by Tasks 4-6. Task 8 — Float-aware NoInstance diagnostic: check/lib.rs:856-880 addendum extended to name `float_eq` / `float_lt` as the explicit alternative for Eq/Ord at Float; eq_float_noinstance.rs:32-44 assertion extended. Task 9 — IR snapshot regen: subsumed by Task 3 (prelude shift forced immediate snapshot regen; deferring to Task 9 would have left the workspace red between tasks). Task 10 — Prose-projection cleanup: 6 comparator arms deleted from binop_info; 3 in-source mod-tests updated/deleted (comparator-infix rendering would be dishonest now that the operators are no longer language identifiers). Task 11 — Contract updates: 5 design files rewritten to the class-dispatch present — float-semantics.md (arithmetic guarantees retained on +/-/*/; comparison guarantees transferred from ==/!=/< to float_eq/float_ne/float_lt/etc.); prelude-classes.md (Eq Unit added to instance list; new paragraph on six float_* fns; Float-no-Eq/Ord clause gains `→ use float_eq` cross-reference); str-abi.md (clause "REMAIN primitive operators" rewritten to describe class-method dispatch); scope-boundaries.md (multiple operator-name and Pattern::Lit-desugar clauses rewritten); authoring-surface.md (==, <= dropped from operator-example list). Task 12 — Initial acceptance gate: workspace 638/0 GREEN; bench/compile_check + cross_lang 0 regressed; bench/check.py flagged 4 regressions on bench_closure_chain (+29% bump_s, +47% rc_s, +29% bump_rss_kb, +48% rc_rss_kb). Orchestrator initially classified as DONE-with-concerns; Boss reclassified as PARTIAL-via-acceptance-#8-fail after independent re-run, extended iter scope to Task 13. Task 13 — Direct icmp intercept arms (Boss-extension): try_emit_primitive_instance_body gains direct-icmp arms for lt__Int / le__Int / gt__Int / ge__Int / ne__Int, bypassing the compare__Int → Ordering → match indirection that allocated one Ordering ctor per call in tight loops. Each new arm inherits `alwaysinline` via the existing allowlist (extended accordingly). New IR pin test `ord_int_intercept_ir_pin.rs` + smoke fixture `ord_int_intercept_smoke.ail` ratify the optimization — opt -O2 -S confirms zero `call @ail_prelude_lt__Int` in optimized IR; the icmp folds directly at every use site. Bool variants (lt__Bool/etc.) deliberately NOT added — no bench/example calls Ord at Bool; spec-extension permits skipping if unreachable at bench level. Family can be extended symmetrically when first Bool-ordered perf workload appears. Bench-gate post-Task-13: bench_closure_chain bump_s -6.05%, rc_s -2.67%, bump_rss_kb -0.77%, rc_rss_kb +0.46% — all four previously-regressed metrics back inside tolerance. Full bench corpus: 36 metrics, 0 regressed, 0 improved beyond tolerance, 36 stable. bench/check.py exit 0 ✓; bench/compile_check.py exit 0 ✓; bench/cross_lang.py exit 0 ✓. Workspace: 640 passed, 0 failed across all binaries (delta vs. milestone start: +5 new E2E/pin tests added in Task 1 + 1 IR pin added in Task 13 − 9 in-source mod tests deleted as obsolete net ≈ −3). The eq_user_adt_smoke fixture's Unit-opening line was the deliberate RED-first device added in planner self-review so the north-star wouldn't accidentally GREEN at start (user-ADT-Eq on Point with hand-written instance was already operable today; the milestone's actual delivery is operator-name death + Eq Unit + Float-named-fns + cleanup of the two-pathy primitive comparator machinery). Net delta: 96 files changed, 1760 insertions, 1101 deletions; 12 net-new files (6 new fixtures, 5 new E2E/pin tests, 1 stats file). main passes-test-count: 640 (was 633 pre-iter, accounting for the deletions). Spec-vs-acceptance addendum: spec §Testing strategy anticipated the bench-gate-regression case with two recovery paths (`alwaysinline` investigation or "spec needs revisiting toward α"). Task 13 is the third path — direct intercept arms for `lt`/etc. that bypass the compare→match path entirely. The spec's contingency clause was thus generous enough to absorb Task 13 without spec revision, but a future iter that hits a class-method primitive where the body shape introduces a similar codegen cost (Ordering allocation, RC tax, deferred-init) should expect a parallel extension. The pattern is "primitive instance whose canonical body indirects through other class methods that allocate" → add a direct-emit intercept arm + alwaysinline + IR-shape pin. Concerns absorbed: - Codegen lower_app / resolve_top_level_fn gained a prelude-fallback lookup so bare monomorphic prelude fns (`float_eq` etc.) resolve from non-prelude modules without explicit `prelude.float_eq` qualifier. Mirrors the typechecker's implicit prelude import — not in plan but necessary infra for the named-fn surface to be callable. - Recon's "≈10 fixtures" estimate was 6× too low — 58 actual. Mechanical migration; no design impact. - Recon caught 4 in-source AST-literal sites the spec missed (lib.rs:5656 `>=` site + three codegen/lib.rs sites); Task 5 covered all. - Recon caught 2 contract files outside the spec's update set that directly contradicted the milestone (str-abi.md + scope-boundaries.md "REMAIN primitive operators" / "Pattern::Lit desugar to ==" clauses); Task 11 covered all 5. Stats file: `bench/orchestrator-stats/2026-05-21-iter-operator-routing-eq-ord.1.json`. closes #1
295 lines
11 KiB
Rust
295 lines
11 KiB
Rust
//! Hash-pin integration tests, relocated from `ailang-core/src/hash.rs`
|
|
//! `#[cfg(test)] mod tests` to a `tests/*` integration crate in iter
|
|
//! form-a.1 Task 5. The relocation removes the production-source file's
|
|
//! ad-hoc `examples/<stem>.ail.json` reads in favour of loading the
|
|
//! `.ail` siblings via `ailang_surface::load_module`, mirroring the
|
|
//! Form-A authoring discipline of the form-a-default-authoring
|
|
//! milestone. Hash assertions are unchanged: post-form-a the canonical
|
|
//! JSON-AST is still the hashable representation, derived in-process
|
|
//! from `.ail` by the surface loader.
|
|
//!
|
|
//! The `examples/<stem>.ail.json` fixtures that backed the original
|
|
//! tests are deleted in Task 8; the `.ail` siblings rendered in Task 2
|
|
//! are the authored form going forward. The four schema-stability pins
|
|
//! (iter13a / iter19b / iter22b1 / ct4) plus the two structural pins
|
|
//! (hash_is_stable / hash_changes_with_content / classdef-empty-optionals
|
|
//! / forall-without-constraints) all keep their assertion shape.
|
|
|
|
use ailang_core::ast::*;
|
|
use ailang_core::canonical;
|
|
use ailang_core::hash::def_hash;
|
|
|
|
fn examples_dir() -> std::path::PathBuf {
|
|
let manifest_dir = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"));
|
|
manifest_dir.parent().unwrap().parent().unwrap().join("examples")
|
|
}
|
|
|
|
fn sample_fn() -> Def {
|
|
Def::Fn(FnDef {
|
|
name: "add".into(),
|
|
ty: Type::Fn {
|
|
params: vec![Type::int(), Type::int()],
|
|
ret: Box::new(Type::int()),
|
|
effects: vec![],
|
|
param_modes: vec![],
|
|
ret_mode: ParamMode::Implicit,
|
|
},
|
|
params: vec!["a".into(), "b".into()],
|
|
body: Term::App {
|
|
callee: Box::new(Term::Var { name: "+".into() }),
|
|
args: vec![
|
|
Term::Var { name: "a".into() },
|
|
Term::Var { name: "b".into() },
|
|
],
|
|
tail: false,
|
|
},
|
|
suppress: vec![],
|
|
doc: None,
|
|
export: None,
|
|
})
|
|
}
|
|
|
|
#[test]
|
|
fn hash_is_stable() {
|
|
let h1 = def_hash(&sample_fn());
|
|
let h2 = def_hash(&sample_fn());
|
|
assert_eq!(h1, h2);
|
|
assert_eq!(h1.len(), 16);
|
|
}
|
|
|
|
#[test]
|
|
fn hash_changes_with_content() {
|
|
let mut def = sample_fn();
|
|
let h1 = def_hash(&def);
|
|
if let Def::Fn(ref mut f) = def {
|
|
f.name = "mul".into();
|
|
}
|
|
let h2 = def_hash(&def);
|
|
assert_ne!(h1, h2);
|
|
}
|
|
|
|
/// adding `vars` to TypeDef and `args` to
|
|
/// `Type::Con` must NOT change canonical-JSON hashes of any pre-13a
|
|
/// definition. Recorded hashes were captured from on-disk modules
|
|
/// before the schema extension; if this fires, a
|
|
/// `skip_serializing_if` is missing or wrong.
|
|
///
|
|
/// 2026-05-21 operator-routing-eq-ord re-pinned (prior:
|
|
/// db33f57cb329935e): sum.ail's body migrates `(app == n 0)` →
|
|
/// `(app eq n 0)` per the operator-name deletion; hash follows the
|
|
/// content change. Pin remains a schema-extension guard against
|
|
/// future drift from the new content baseline.
|
|
#[test]
|
|
fn iter13a_schema_extension_preserves_pre_13a_hashes() {
|
|
let examples = examples_dir();
|
|
|
|
let sum_mod = ailang_surface::load_module(&examples.join("sum.ail"))
|
|
.expect("examples/sum.ail loads");
|
|
let sum_def = sum_mod.defs.iter().find(|d| d.name() == "sum").unwrap();
|
|
assert_eq!(def_hash(sum_def), "25343a2e5927a257");
|
|
|
|
let list_mod = ailang_surface::load_module(&examples.join("list.ail"))
|
|
.expect("examples/list.ail loads");
|
|
let int_list_def = list_mod.defs.iter().find(|d| d.name() == "IntList").unwrap();
|
|
assert_eq!(def_hash(int_list_def), "b082192bd0c99202");
|
|
}
|
|
|
|
/// loop-recur iter 1 regression: adding `Term::Loop` / `Term::Recur`
|
|
/// (and `struct LoopBinder`) must NOT change canonical-JSON hashes
|
|
/// of any pre-loop-recur definition. The additive variant carries a
|
|
/// new `"t"` tag absent from every pre-existing fixture, so the
|
|
/// recorded hashes below must stay byte-identical. If this fires,
|
|
/// the extension is non-additive (a `skip_serializing_if` is missing
|
|
/// or an existing variant's shape drifted).
|
|
#[test]
|
|
fn loop_recur_schema_extension_preserves_pre_loop_recur_hashes() {
|
|
let examples = examples_dir();
|
|
|
|
let sum_mod = ailang_surface::load_module(&examples.join("sum.ail"))
|
|
.expect("examples/sum.ail loads");
|
|
let sum_def = sum_mod.defs.iter().find(|d| d.name() == "sum").unwrap();
|
|
assert_eq!(def_hash(sum_def), "25343a2e5927a257");
|
|
|
|
let list_mod = ailang_surface::load_module(&examples.join("list.ail"))
|
|
.expect("examples/list.ail loads");
|
|
let int_list_def = list_mod.defs.iter().find(|d| d.name() == "IntList").unwrap();
|
|
assert_eq!(def_hash(int_list_def), "b082192bd0c99202");
|
|
}
|
|
|
|
/// adding `suppress` to FnDef must NOT change
|
|
/// canonical-JSON hashes of any pre-19b fn whose `suppress` is empty.
|
|
/// The `skip_serializing_if = "Vec::is_empty"` predicate on the field
|
|
/// is what enforces this; if it is wrong, every existing fixture's
|
|
/// hash drifts and `ail diff` / `ail manifest` output breaks.
|
|
#[test]
|
|
fn iter19b_empty_suppress_preserves_pre_19b_hashes() {
|
|
let with_empty_suppress = sample_fn();
|
|
// Mutate the bare sample to set suppress explicitly to a
|
|
// non-empty Vec, then mutate it back to empty: two distinct
|
|
// construction paths that should still hash identically.
|
|
let mut with_explicit_empty = sample_fn();
|
|
if let Def::Fn(ref mut f) = with_explicit_empty {
|
|
f.suppress = vec![];
|
|
}
|
|
assert_eq!(
|
|
def_hash(&with_empty_suppress),
|
|
def_hash(&with_explicit_empty),
|
|
"two FnDefs with empty suppress must hash identically"
|
|
);
|
|
|
|
// And: a FnDef with a *non-empty* suppress hashes differently.
|
|
let mut with_suppress = sample_fn();
|
|
if let Def::Fn(ref mut f) = with_suppress {
|
|
f.suppress = vec![Suppress {
|
|
code: "over-strict-mode".into(),
|
|
because: "test reason".into(),
|
|
}];
|
|
}
|
|
assert_ne!(
|
|
def_hash(&with_empty_suppress),
|
|
def_hash(&with_suppress),
|
|
"non-empty suppress must produce a distinct hash"
|
|
);
|
|
}
|
|
|
|
/// an on-disk pre-19b fixture must still load cleanly
|
|
/// (no `suppress` field present in the JSON) and produce its
|
|
/// canonical-byte hash unchanged.
|
|
#[test]
|
|
fn iter19b_schema_extension_preserves_pre_19b_hashes() {
|
|
let examples = examples_dir();
|
|
|
|
let sum_mod = ailang_surface::load_module(&examples.join("sum.ail"))
|
|
.expect("examples/sum.ail loads");
|
|
let sum_def = sum_mod.defs.iter().find(|d| d.name() == "sum").unwrap();
|
|
assert_eq!(def_hash(sum_def), "25343a2e5927a257");
|
|
}
|
|
|
|
/// adding `Def::Class` and `Def::Instance` must
|
|
/// NOT change canonical-JSON hashes of any pre-22b def. The new variants
|
|
/// are alternatives, not field additions — pre-22b fixtures simply do
|
|
/// not produce a `Class` / `Instance` `Def`, and the existing arms are
|
|
/// unchanged.
|
|
#[test]
|
|
fn iter22b1_schema_extension_preserves_pre_22b_hashes() {
|
|
let examples = examples_dir();
|
|
|
|
let sum_mod = ailang_surface::load_module(&examples.join("sum.ail"))
|
|
.expect("examples/sum.ail loads");
|
|
let sum_def = sum_mod.defs.iter().find(|d| d.name() == "sum").unwrap();
|
|
assert_eq!(def_hash(sum_def), "25343a2e5927a257");
|
|
|
|
let list_mod = ailang_surface::load_module(&examples.join("list.ail"))
|
|
.expect("examples/list.ail loads");
|
|
let int_list_def = list_mod
|
|
.defs
|
|
.iter()
|
|
.find(|d| d.name() == "IntList")
|
|
.unwrap();
|
|
assert_eq!(def_hash(int_list_def), "b082192bd0c99202");
|
|
}
|
|
|
|
/// a ClassDef with no doc, no superclass, and an empty
|
|
/// methods list serialises to a stable canonical form. Two construction
|
|
/// paths (default-elided optionals vs. JSON without those keys at all)
|
|
/// hash bit-identically.
|
|
#[test]
|
|
fn iter22b1_classdef_empty_optionals_hash_stable() {
|
|
let bare = Def::Class(ClassDef {
|
|
name: "Empty".into(),
|
|
param: "a".into(),
|
|
superclass: None,
|
|
methods: vec![],
|
|
doc: None,
|
|
});
|
|
|
|
let json = r#"{"kind":"class","name":"Empty","param":"a","methods":[]}"#;
|
|
let parsed: Def = serde_json::from_str(json).unwrap();
|
|
|
|
assert_eq!(
|
|
def_hash(&bare),
|
|
def_hash(&parsed),
|
|
"ClassDef with elided optionals must hash identically to construction with explicit None"
|
|
);
|
|
}
|
|
|
|
/// adding `constraints` to `Type::Forall` must NOT alter
|
|
/// canonical-JSON bytes of any pre-22b.2 polymorphic type.
|
|
#[test]
|
|
fn forall_without_constraints_hashes_bit_identical_to_pre_22b2() {
|
|
let t = Type::Forall {
|
|
vars: vec!["a".into()],
|
|
constraints: vec![],
|
|
body: Box::new(Type::fn_implicit(
|
|
vec![Type::Var { name: "a".into() }],
|
|
Type::Var { name: "a".into() },
|
|
vec![],
|
|
)),
|
|
};
|
|
let bytes = canonical::to_bytes(&t);
|
|
let s = std::str::from_utf8(&bytes).unwrap();
|
|
assert!(
|
|
!s.contains("constraints"),
|
|
"Type::Forall serialised must omit `constraints` when empty; got: {s}"
|
|
);
|
|
}
|
|
|
|
/// pin the
|
|
/// canonical-form hashes of the two cross-module fixtures migrated by
|
|
/// `ail migrate-canonical-types` in the canonical-form migration. These hashes are the
|
|
/// post-migration state.
|
|
#[test]
|
|
fn ct4_migrated_fixtures_have_canonical_form_hashes() {
|
|
let examples = examples_dir();
|
|
|
|
let ord_mod = ailang_surface::load_module(&examples.join("ordering_match.ail"))
|
|
.expect("examples/ordering_match.ail loads");
|
|
let main_def = ord_mod.defs.iter().find(|d| d.name() == "main").unwrap();
|
|
// The hash reflects a corpus migration: `ordering_match.ail`'s
|
|
// body moved from `(do io/print_int x)` to `(app print x)` when
|
|
// the per-type print effect-ops were retired in favour of the
|
|
// polymorphic `print` helper.
|
|
assert_eq!(
|
|
def_hash(main_def),
|
|
"b65a7f834703ffb4",
|
|
"ordering_match::main canonical hash must match captured post-per-type-print-retirement value"
|
|
);
|
|
|
|
let dup_a_mod = ailang_surface::load_module(&examples.join("test_22b1_dup_a.ail"))
|
|
.expect("examples/test_22b1_dup_a.ail loads");
|
|
assert_eq!(dup_a_mod.defs.len(), 1, "test_22b1_dup_a expected to have exactly 1 def (the instance)");
|
|
assert_eq!(
|
|
def_hash(&dup_a_mod.defs[0]),
|
|
"392c247f07de6517",
|
|
"test_22b1_dup_a instance hash drifted; expected post-24.2 captured value"
|
|
);
|
|
|
|
let dup_classmod_mod = ailang_surface::load_module(&examples.join("test_22b1_dup_classmod.ail"))
|
|
.expect("examples/test_22b1_dup_classmod.ail loads");
|
|
assert_eq!(dup_classmod_mod.defs.len(), 1, "test_22b1_dup_classmod expected to have exactly 1 def (class TShow)");
|
|
assert_eq!(
|
|
def_hash(&dup_classmod_mod.defs[0]),
|
|
"b8bca96c2d09ed93",
|
|
"test_22b1_dup_classmod class TShow canonical hash; post-24.2 captured value"
|
|
);
|
|
}
|
|
|
|
/// re-assert that the canonical-form tightening did NOT
|
|
/// change hashes of intra-module-only fixtures.
|
|
#[test]
|
|
fn ct4_unmigrated_fixtures_remain_bit_identical() {
|
|
let examples = examples_dir();
|
|
|
|
let sum_mod = ailang_surface::load_module(&examples.join("sum.ail"))
|
|
.expect("examples/sum.ail loads");
|
|
let sum_def = sum_mod.defs.iter().find(|d| d.name() == "sum").unwrap();
|
|
assert_eq!(def_hash(sum_def), "25343a2e5927a257",
|
|
"sum.sum hash drifted across canonical-form tightening — unexpected");
|
|
|
|
let list_mod = ailang_surface::load_module(&examples.join("list.ail"))
|
|
.expect("examples/list.ail loads");
|
|
let int_list_def = list_mod.defs.iter().find(|d| d.name() == "IntList").unwrap();
|
|
assert_eq!(def_hash(int_list_def), "b082192bd0c99202",
|
|
"list.IntList hash drifted across canonical-form tightening — unexpected");
|
|
}
|