Brummel
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.
72 lines
2.8 KiB
Rust
72 lines
2.8 KiB
Rust
//! Regression for the `Registry.type_def_module` re-key (ctt.2).
|
|
//!
|
|
//! Two modules each declare `type Foo` with distinct ctors and
|
|
//! provide an `instance MyC Foo`. Pre-ctt.2, both bare `Foo`s
|
|
//! collide on the bare-name `BTreeMap<String, String>` key —
|
|
//! `normalize_type_for_registry` qualifies both to whichever
|
|
//! module won the insert race, and the loser's instance trips
|
|
//! a false `DuplicateInstance`. Post-ctt.2, the tuple-keyed map
|
|
//! distinguishes the two `Foo`s by owning module; both instances
|
|
//! register cleanly under distinct canonical keys.
|
|
//!
|
|
//! This test goes red today (DuplicateInstance) and green after
|
|
//! the re-key.
|
|
|
|
use ailang_core::canonical;
|
|
use ailang_core::ast::Type;
|
|
use ailang_surface::load_workspace;
|
|
use std::path::Path;
|
|
|
|
fn examples_dir() -> std::path::PathBuf {
|
|
let manifest = env!("CARGO_MANIFEST_DIR");
|
|
Path::new(manifest)
|
|
.parent().expect("CARGO_MANIFEST_DIR has a parent (crates/)")
|
|
.parent().expect("crates has a parent (workspace root)")
|
|
.join("examples")
|
|
}
|
|
|
|
#[test]
|
|
fn two_modules_with_same_bare_foo_both_register() {
|
|
let entry = examples_dir().join("ctt2_collision_main.ail");
|
|
let ws = load_workspace(&entry)
|
|
.expect("expected workspace load to succeed; both `type Foo` declarations live in distinct modules and must register under distinct canonical keys");
|
|
|
|
// Compute the canonical type hashes for the two expected entries.
|
|
let main_foo_hash = canonical::type_hash(&Type::Con {
|
|
name: "ctt2_collision_main.Foo".into(),
|
|
args: vec![],
|
|
});
|
|
let lib_foo_hash = canonical::type_hash(&Type::Con {
|
|
name: "ctt2_collision_lib.Foo".into(),
|
|
args: vec![],
|
|
});
|
|
|
|
// mq.1: registry-entries key is keyed by the qualified class name.
|
|
let main_key = ("ctt2_collision_cls.MyC".to_string(), main_foo_hash);
|
|
let lib_key = ("ctt2_collision_cls.MyC".to_string(), lib_foo_hash);
|
|
|
|
assert!(
|
|
ws.registry.entries.contains_key(&main_key),
|
|
"registry missing entry for (MyC, ctt2_collision_main.Foo); entries: {:?}",
|
|
ws.registry.entries.keys().collect::<Vec<_>>()
|
|
);
|
|
assert!(
|
|
ws.registry.entries.contains_key(&lib_key),
|
|
"registry missing entry for (MyC, ctt2_collision_lib.Foo); entries: {:?}",
|
|
ws.registry.entries.keys().collect::<Vec<_>>()
|
|
);
|
|
|
|
// Defining-module sanity: each entry's defining_module matches
|
|
// the module that wrote the instance.
|
|
let main_entry = &ws.registry.entries[&main_key];
|
|
assert_eq!(
|
|
main_entry.defining_module, "ctt2_collision_main",
|
|
"main-side entry's defining_module mismatched"
|
|
);
|
|
let lib_entry = &ws.registry.entries[&lib_key];
|
|
assert_eq!(
|
|
lib_entry.defining_module, "ctt2_collision_lib",
|
|
"lib-side entry's defining_module mismatched"
|
|
);
|
|
}
|