aver-lang 0.26.0

VM and transpiler for Aver, a statically-typed language designed for AI-assisted development
Documentation
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
//! Phase 6 wave 12a — type-instantiation discovery on MIR.
//!
//! Walks every `Spanned<MirExpr>` in a `MirProgram` and harvests the
//! concrete instantiations of Aver's built-in generic shapes
//! (`List<T>`, `Map<K, V>`, `Vector<T>`, `Tuple<T₁..Tₙ>`,
//! `Option<T>`, `Result<T, E>`) that appear anywhere — fn
//! signatures, expression `ty()` stamps, constructor / literal
//! shapes. Returns a deduped registry per kind.
//!
//! ## Motivation
//!
//! Each backend currently runs its own discovery pass:
//! `src/codegen/wasm_gc/types_discovery.rs` is 897 lines of AST +
//! type-string walkers populating wasm-gc's `TypeRegistry`. The
//! Rust backend duplicates similar logic. They walk the same shape
//! information; they emit the same instantiations. Each backend
//! does its own walk because pre-Phase-6 there was nowhere to
//! park a shared answer.
//!
//! MIR type stamps (Phase 6 wave 1 — `Spanned<MirExpr>` now
//! carries `Option<Type>` on every node) finally give MIR enough
//! information to do discovery once and hand backends a manifest.
//! This wave adds the discovery API without rewiring any backend;
//! the comparison tests (wave 12b) prove the manifest matches
//! wasm-gc's discovery output before we port wasm-gc onto it
//! (wave 12c).
//!
//! ## What this doesn't do (yet)
//!
//! - **No monomorphisation of user fns.** Aver has no user-level
//!   generics (no `fn id<T>(x: T) -> T`); only the built-in
//!   generic types are polymorphic and only via their wbudowane
//!   signatures (`List.prepend<T>` etc.). So there are no
//!   `MirFn` clones to produce — the manifest is just the set of
//!   concrete instantiations of Aver's built-in generic shapes,
//!   which is what backends need to allocate helpers for.
//! - **No backend wiring.** Wave 12c (separate PR) replaces
//!   `wasm_gc::types_discovery` with calls into this manifest.
//!
//! ## Discovery scope
//!
//! For every `MirExpr` node in every fn body, walk
//! `Spanned::ty()` recursively (it's a `Type` tree — `List<T>`'s
//! `T` may itself be `Map<K, V>` etc.) and register every nested
//! generic at every depth. Plus pick up shape hints from the node
//! itself when the stamp is missing:
//!
//! - `MirExpr::List(items)` — if any item has `ty()`, register
//!   `List<T>` directly so empty-list literals without an outer
//!   stamp still surface their element type via the items.
//! - `MirExpr::Tuple(items)` — same treatment for the tuple
//!   shape; the items' types drive the `Tuple<T₁..Tₙ>` arity.
//! - `MirExpr::MapLiteral(entries)` — first entry's `(K, V)`
//!   seeds the `Map<K, V>` instantiation when no outer stamp
//!   sits on the literal.
//! - `MirExpr::Construct(MirCtor::Builtin(Option/Result))` —
//!   the constructor's arg `ty()` seeds the inner type.

use std::collections::HashSet;

use crate::ast::Type;

use crate::ir::hir::BuiltinCtor;

use super::expr::{MirCtor, MirExpr};
use super::program::MirProgram;

/// Per-kind manifest of concrete generic instantiations found in
/// a `MirProgram`. Each `Vec` carries source-order-unique entries
/// (deduped by canonical textual form), so the order is stable
/// across runs against the same input — useful for snapshot
/// tests and for matching backend output positionally.
#[derive(Debug, Clone, Default, PartialEq)]
pub struct InstantiationRegistry {
    /// Distinct `T`s appearing as `List<T>` anywhere in the
    /// program.
    pub lists: Vec<Type>,
    /// Distinct `(K, V)` pairs appearing as `Map<K, V>`.
    pub maps: Vec<(Type, Type)>,
    /// Distinct `T`s appearing as `Vector<T>`.
    pub vectors: Vec<Type>,
    /// Distinct tuple arities + element-type sequences. Stored
    /// as `Vec<Type>` per tuple so a `(Int, Str)` and a
    /// `(Int, Str, Bool)` stay separate registrations.
    pub tuples: Vec<Vec<Type>>,
    /// Distinct `T`s appearing as `Option<T>`.
    pub options: Vec<Type>,
    /// Distinct `(T, E)` pairs appearing as `Result<T, E>`.
    pub results: Vec<(Type, Type)>,
}

impl InstantiationRegistry {
    /// Total count of instantiations across all kinds. Useful
    /// for quick smoke assertions in tests + diagnostics.
    pub fn total(&self) -> usize {
        self.lists.len()
            + self.maps.len()
            + self.vectors.len()
            + self.tuples.len()
            + self.options.len()
            + self.results.len()
    }
}

/// Walk every fn body in `program` and harvest every concrete
/// instantiation of Aver's built-in generic shapes. Deduplicates
/// by textual canonical form within each kind; order matches
/// first-occurrence in walk order.
pub fn discover_instantiations(program: &MirProgram) -> InstantiationRegistry {
    let mut walker = Walker::default();
    // Walk fns in `FnId` order for stability — `iter()` is
    // `HashMap` order otherwise.
    let mut ordered: Vec<_> = program.iter().collect();
    ordered.sort_by_key(|(fn_id, _)| fn_id.0);
    for (_, mir_fn) in ordered {
        // Register the body's top-level stamp before descending —
        // the `visit_expr` walk only sees children's stamps from
        // their parent nodes; the body root has no parent.
        walker.register_ty(mir_fn.body.ty());
        walker.visit_expr(&mir_fn.body.node);
    }
    walker.registry
}

#[derive(Default)]
struct Walker {
    registry: InstantiationRegistry,
    seen_lists: HashSet<String>,
    seen_maps: HashSet<String>,
    seen_vectors: HashSet<String>,
    seen_tuples: HashSet<String>,
    seen_options: HashSet<String>,
    seen_results: HashSet<String>,
}

impl Walker {
    fn visit_expr(&mut self, expr: &MirExpr) {
        // Pull the type stamp off the wrapping `Spanned` via
        // recursion entry points: every recursive descent starts
        // from `Spanned<MirExpr>`, so we register that level's
        // stamp before recursing into children.
        match expr {
            MirExpr::Literal(_) | MirExpr::Local(_) | MirExpr::FnValue(_) => {}
            MirExpr::Neg(inner) => {
                self.register_ty(inner.ty());
                self.visit_expr(&inner.node);
            }
            MirExpr::BinOp(spanned_bop) => {
                let bop = &spanned_bop.node;
                self.register_ty(bop.lhs.ty());
                self.visit_expr(&bop.lhs.node);
                self.register_ty(bop.rhs.ty());
                self.visit_expr(&bop.rhs.node);
            }
            MirExpr::Let(spanned_let) => {
                let let_node = &spanned_let.node;
                self.register_ty(let_node.value.ty());
                self.visit_expr(&let_node.value.node);
                self.register_ty(let_node.body.ty());
                self.visit_expr(&let_node.body.node);
            }
            MirExpr::Call(spanned_call) => {
                for arg in &spanned_call.node.args {
                    self.register_ty(arg.ty());
                    self.visit_expr(&arg.node);
                }
            }
            MirExpr::TailCall(spanned_tc) => {
                for arg in &spanned_tc.node.args {
                    self.register_ty(arg.ty());
                    self.visit_expr(&arg.node);
                }
            }
            MirExpr::Match(spanned_match) => {
                let m = &spanned_match.node;
                self.register_ty(m.subject.ty());
                self.visit_expr(&m.subject.node);
                for arm in &m.arms {
                    self.register_ty(arm.body.ty());
                    self.visit_expr(&arm.body.node);
                }
            }
            MirExpr::IfThenElse(spanned_ite) => {
                let ite = &spanned_ite.node;
                self.register_ty(ite.cond.ty());
                self.visit_expr(&ite.cond.node);
                self.register_ty(ite.then_branch.ty());
                self.visit_expr(&ite.then_branch.node);
                self.register_ty(ite.else_branch.ty());
                self.visit_expr(&ite.else_branch.node);
            }
            MirExpr::Construct(spanned_ctor) => {
                let con = &spanned_ctor.node;
                // Built-in wrapper constructors (`Result.Ok`,
                // `Option.Some`, `Result.Err`) carry their inner
                // type via the first arg's `ty()`. Seed the
                // outer instantiation from there when the
                // typecheck didn't stamp the outer literal.
                if let MirCtor::Builtin(bc) = con.ctor {
                    self.seed_builtin_ctor(bc, &con.args);
                }
                for arg in &con.args {
                    self.register_ty(arg.ty());
                    self.visit_expr(&arg.node);
                }
            }
            MirExpr::RecordCreate(spanned_rec) => {
                for f in &spanned_rec.node.fields {
                    self.register_ty(f.value.ty());
                    self.visit_expr(&f.value.node);
                }
            }
            MirExpr::RecordUpdate(spanned_upd) => {
                self.register_ty(spanned_upd.node.base.ty());
                self.visit_expr(&spanned_upd.node.base.node);
                for f in &spanned_upd.node.updates {
                    self.register_ty(f.value.ty());
                    self.visit_expr(&f.value.node);
                }
            }
            MirExpr::Project(spanned_proj) => {
                self.register_ty(spanned_proj.node.base.ty());
                self.visit_expr(&spanned_proj.node.base.node);
            }
            MirExpr::Try(inner)
            | MirExpr::Return(inner)
            | MirExpr::Box(inner)
            | MirExpr::Unbox(inner) => {
                self.register_ty(inner.ty());
                self.visit_expr(&inner.node);
            }
            MirExpr::List(items) => {
                // Seed `List<T>` from the items even when the
                // outer literal has no stamp (empty-list shape
                // gets covered by Phase 6 wave 1 stamps; this
                // is the belt-and-braces case).
                if let Some(first) = items.first().and_then(|i| i.ty()) {
                    self.register_list_t(first);
                }
                for item in items {
                    self.register_ty(item.ty());
                    self.visit_expr(&item.node);
                }
            }
            MirExpr::Tuple(items) => {
                // Seed `Tuple<T₁..Tₙ>` from the items.
                let tys: Vec<Type> = items.iter().filter_map(|i| i.ty().cloned()).collect();
                if tys.len() == items.len() && !tys.is_empty() {
                    self.register_tuple(tys);
                }
                for item in items {
                    self.register_ty(item.ty());
                    self.visit_expr(&item.node);
                }
            }
            MirExpr::MapLiteral(entries) => {
                if let Some((k_first, v_first)) = entries.first()
                    && let (Some(k_ty), Some(v_ty)) = (k_first.ty(), v_first.ty())
                {
                    self.register_map_kv(k_ty, v_ty);
                }
                for (k, v) in entries {
                    self.register_ty(k.ty());
                    self.visit_expr(&k.node);
                    self.register_ty(v.ty());
                    self.visit_expr(&v.node);
                }
            }
            MirExpr::InterpolatedStr(parts) => {
                for part in parts {
                    if let super::expr::MirStrPart::Expr(e) = part {
                        self.register_ty(e.ty());
                        self.visit_expr(&e.node);
                    }
                }
            }
            MirExpr::IndependentProduct(spanned_ip) => {
                for item in &spanned_ip.node.items {
                    self.register_ty(item.ty());
                    self.visit_expr(&item.node);
                }
            }
        }
    }

    fn seed_builtin_ctor(&mut self, ctor: BuiltinCtor, args: &[crate::ast::Spanned<MirExpr>]) {
        match ctor {
            BuiltinCtor::OptionSome => {
                if let Some(first) = args.first().and_then(|a| a.ty()) {
                    self.register_option_t(first);
                }
            }
            BuiltinCtor::OptionNone => {}
            BuiltinCtor::ResultOk => {
                // Ok(T) carries T; E is unknown from this site.
                // We register it as `Result<T, Invalid>` placeholder
                // so the kind shows up; consumers (backends) merge
                // by T when full pairs aren't observed.
                if let Some(t) = args.first().and_then(|a| a.ty()) {
                    self.register_result_te(t, &Type::Invalid);
                }
            }
            BuiltinCtor::ResultErr => {
                if let Some(e) = args.first().and_then(|a| a.ty()) {
                    self.register_result_te(&Type::Invalid, e);
                }
            }
        }
    }

    /// Top-level type registration — descends the type tree
    /// recursively so nested generics (`List<Map<Str, Int>>`)
    /// surface every layer.
    fn register_ty(&mut self, ty: Option<&Type>) {
        let Some(ty) = ty else { return };
        match ty {
            Type::List(inner) => {
                self.register_list_t(inner);
            }
            Type::Vector(inner) => {
                self.register_vector_t(inner);
            }
            Type::Option(inner) => {
                self.register_option_t(inner);
            }
            Type::Map(k, v) => {
                self.register_map_kv(k, v);
            }
            Type::Result(t, e) => {
                self.register_result_te(t, e);
            }
            Type::Tuple(items) => {
                self.register_tuple(items.clone());
            }
            Type::Fn(args, ret, _effects) => {
                for a in args {
                    self.register_ty(Some(a));
                }
                self.register_ty(Some(ret));
            }
            // Primitives + named user types don't open further
            // sub-instantiations; they may BE inside a generic
            // wrapper but their own walk terminates here.
            Type::Int
            | Type::Float
            | Type::Str
            | Type::Bool
            | Type::Unit
            | Type::Var(_)
            | Type::Invalid
            | Type::Named { .. } => {}
        }
    }

    fn register_list_t(&mut self, t: &Type) {
        let key = format!("{t:?}");
        if self.seen_lists.insert(key) {
            self.registry.lists.push(t.clone());
        }
        // Recurse into the element type so nested generics land too.
        self.register_ty(Some(t));
    }

    fn register_vector_t(&mut self, t: &Type) {
        let key = format!("{t:?}");
        if self.seen_vectors.insert(key) {
            self.registry.vectors.push(t.clone());
        }
        self.register_ty(Some(t));
    }

    fn register_option_t(&mut self, t: &Type) {
        let key = format!("{t:?}");
        if self.seen_options.insert(key) {
            self.registry.options.push(t.clone());
        }
        self.register_ty(Some(t));
    }

    fn register_map_kv(&mut self, k: &Type, v: &Type) {
        let key = format!("({k:?},{v:?})");
        if self.seen_maps.insert(key) {
            self.registry.maps.push((k.clone(), v.clone()));
        }
        self.register_ty(Some(k));
        self.register_ty(Some(v));
    }

    fn register_result_te(&mut self, t: &Type, e: &Type) {
        let key = format!("({t:?},{e:?})");
        if self.seen_results.insert(key) {
            self.registry.results.push((t.clone(), e.clone()));
        }
        self.register_ty(Some(t));
        self.register_ty(Some(e));
    }

    fn register_tuple(&mut self, items: Vec<Type>) {
        let key = format!("{items:?}");
        if self.seen_tuples.insert(key) {
            for item in &items {
                self.register_ty(Some(item));
            }
            self.registry.tuples.push(items);
        }
    }
}

#[cfg(test)]
mod tests {
    use super::*;
    use crate::ast::{Literal, Spanned};
    use crate::ir::FnId;
    use crate::ir::mir::{MirExpr, MirFn};

    fn span_with_ty<T>(node: T, ty: Type) -> Spanned<T> {
        let cell = std::sync::OnceLock::new();
        let _ = cell.set(ty);
        Spanned {
            node,
            line: 0,
            ty: cell,
        }
    }

    fn span<T>(node: T) -> Spanned<T> {
        Spanned {
            node,
            line: 0,
            ty: std::sync::OnceLock::new(),
        }
    }

    fn one_fn_program(body: Spanned<MirExpr>) -> MirProgram {
        let mut p = MirProgram::empty();
        p.fns.insert(
            FnId(0),
            MirFn {
                fn_id: FnId(0),
                name: "f".to_string(),
                params: vec![],
                return_type: "Int".to_string(),
                effects: vec![],
                body,
                local_count: 0,
                aliased_slots: std::sync::Arc::new(Vec::new()),
                repr: crate::ir::mir::MirFnRepr::default(),
            },
        );
        p
    }

    #[test]
    fn empty_program_yields_empty_registry() {
        let registry = discover_instantiations(&MirProgram::empty());
        assert_eq!(registry.total(), 0);
    }

    #[test]
    fn list_int_stamp_seeds_list_t() {
        let body = span_with_ty(
            MirExpr::Literal(span(Literal::Int(0))),
            Type::List(Box::new(Type::Int)),
        );
        let registry = discover_instantiations(&one_fn_program(body));
        assert_eq!(registry.lists, vec![Type::Int]);
    }

    #[test]
    fn nested_list_map_str_int_registers_every_layer() {
        // `List<Map<Str, Int>>` — both `List<Map<Str, Int>>` AND
        // its inner `Map<Str, Int>` should show up.
        let inner = Type::Map(Box::new(Type::Str), Box::new(Type::Int));
        let outer = Type::List(Box::new(inner.clone()));
        let body = span_with_ty(MirExpr::Literal(span(Literal::Int(0))), outer);
        let registry = discover_instantiations(&one_fn_program(body));
        assert_eq!(registry.lists, vec![inner.clone()]);
        assert_eq!(registry.maps, vec![(Type::Str, Type::Int)]);
    }

    #[test]
    fn deeply_nested_user_example_registers_all_layers() {
        // `List<Map<UserType, Tuple<InnyTyp, Int>>>` — the
        // shape Szymon highlighted. Every layer should surface:
        // - Tuple<InnyTyp, Int>
        // - Map<UserType, Tuple<InnyTyp, Int>>
        // - List<Map<UserType, Tuple<InnyTyp, Int>>>
        let user_type = Type::named("UserType");
        let inny = Type::named("InnyTyp");
        let tuple = Type::Tuple(vec![inny.clone(), Type::Int]);
        let map = Type::Map(Box::new(user_type.clone()), Box::new(tuple.clone()));
        let list = Type::List(Box::new(map.clone()));

        let body = span_with_ty(MirExpr::Literal(span(Literal::Int(0))), list);
        let registry = discover_instantiations(&one_fn_program(body));

        assert_eq!(registry.lists, vec![map.clone()]);
        assert_eq!(registry.maps, vec![(user_type, tuple.clone())]);
        let Type::Tuple(items) = &tuple else {
            unreachable!()
        };
        assert_eq!(registry.tuples, vec![items.clone()]);
    }

    #[test]
    fn duplicates_collapse_within_kind() {
        // Two unrelated stamps of `List<Int>` should yield ONE
        // registration.
        let l_int = Type::List(Box::new(Type::Int));
        let bop = super::super::expr::MirBinOp {
            op: crate::ast::BinOp::Add,
            lhs: Box::new(span_with_ty(
                MirExpr::Literal(span(Literal::Int(1))),
                l_int.clone(),
            )),
            rhs: Box::new(span_with_ty(
                MirExpr::Literal(span(Literal::Int(2))),
                l_int.clone(),
            )),
        };
        let body = span(MirExpr::BinOp(span(bop)));
        let registry = discover_instantiations(&one_fn_program(body));
        assert_eq!(registry.lists.len(), 1);
    }

    #[test]
    fn distinct_list_t_kinds_register_separately() {
        // `List<Int>` AND `List<Str>` from two stamps → two
        // entries.
        let bop = super::super::expr::MirBinOp {
            op: crate::ast::BinOp::Add,
            lhs: Box::new(span_with_ty(
                MirExpr::Literal(span(Literal::Int(1))),
                Type::List(Box::new(Type::Int)),
            )),
            rhs: Box::new(span_with_ty(
                MirExpr::Literal(span(Literal::Int(2))),
                Type::List(Box::new(Type::Str)),
            )),
        };
        let body = span(MirExpr::BinOp(span(bop)));
        let registry = discover_instantiations(&one_fn_program(body));
        assert_eq!(registry.lists.len(), 2);
        assert!(registry.lists.contains(&Type::Int));
        assert!(registry.lists.contains(&Type::Str));
    }

    #[test]
    fn vector_and_option_kinds_route_to_their_own_buckets() {
        let bop = super::super::expr::MirBinOp {
            op: crate::ast::BinOp::Add,
            lhs: Box::new(span_with_ty(
                MirExpr::Literal(span(Literal::Int(0))),
                Type::Vector(Box::new(Type::Bool)),
            )),
            rhs: Box::new(span_with_ty(
                MirExpr::Literal(span(Literal::Int(0))),
                Type::Option(Box::new(Type::Float)),
            )),
        };
        let body = span(MirExpr::BinOp(span(bop)));
        let registry = discover_instantiations(&one_fn_program(body));
        assert_eq!(registry.vectors, vec![Type::Bool]);
        assert_eq!(registry.options, vec![Type::Float]);
    }

    #[test]
    fn result_pair_registers_under_results() {
        let body = span_with_ty(
            MirExpr::Literal(span(Literal::Int(0))),
            Type::Result(Box::new(Type::Int), Box::new(Type::Str)),
        );
        let registry = discover_instantiations(&one_fn_program(body));
        assert_eq!(registry.results, vec![(Type::Int, Type::Str)]);
    }
}