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
//! Definition registration for the IR lowering pass.
//!
//! These methods run before full type-resolved lowering: they walk the
//! AST and the symbol table to allocate IR ids for structs, enums, and
//! traits (including those imported from nested modules) so that later
//! lowering passes can reference them by id without forward-declaration
//! issues.
use super::IrLowerer;
use crate::ast::{self, Definition};
use crate::semantic::{EnumInfo, StructInfo, SymbolTable};
use crate::ir::{
ImportedKind, IrEnum, IrEnumVariant, IrField, IrFunctionSig, IrStruct, IrTrait, TraitId,
};
impl IrLowerer<'_> {
/// Register imported structs and enums from the symbol table.
/// This ensures that imported types have struct/enum IDs in the IR module,
/// so when we instantiate them, `struct_id` is populated correctly.
pub(super) fn register_imported_types(&mut self) {
// Collect the (name, source_module_path) pairs first so the
// borrow on `self.symbols` doesn't overlap the mutable borrow
// of `self.imported_source_context` below.
let imported_struct_pairs: Vec<(String, Vec<String>)> = self
.symbols
.structs
.keys()
.filter_map(|name| {
self.symbols
.get_module_logical_path(name)
.map(|path| (name.clone(), path.clone()))
})
.collect();
for (name, source_path) in imported_struct_pairs {
if let Some(struct_info) = self.symbols.structs.get(&name).cloned() {
self.imported_source_context = Some(source_path);
self.register_struct(&name, &struct_info);
self.imported_source_context = None;
self.try_track_imported_type(&name, ImportedKind::Struct);
}
}
let imported_enum_pairs: Vec<(String, Vec<String>)> = self
.symbols
.enums
.keys()
.filter_map(|name| {
self.symbols
.get_module_logical_path(name)
.map(|path| (name.clone(), path.clone()))
})
.collect();
for (name, source_path) in imported_enum_pairs {
if let Some(enum_info) = self.symbols.enums.get(&name).cloned() {
self.imported_source_context = Some(source_path);
self.register_enum(&name, &enum_info);
self.imported_source_context = None;
self.try_track_imported_type(&name, ImportedKind::Enum);
}
}
// CM-J: Track imported standalone-function and module-let
// imports in IrImport.items so the cross-module qualification
// pass can route bare-name references to their qualified
// forms after inlining.
let function_names: Vec<String> = self
.symbols
.functions
.keys()
.filter(|name| self.symbols.get_module_origin(name).is_some())
.cloned()
.collect();
for name in function_names {
self.try_track_imported_type(&name, ImportedKind::Function);
}
let let_names: Vec<String> = self
.symbols
.lets
.keys()
.filter(|name| self.symbols.get_module_origin(name).is_some())
.cloned()
.collect();
for name in let_names {
self.try_track_imported_type(&name, ImportedKind::ModuleLet);
}
// Register types from imported nested modules (e.g., fill::Solid)
for (module_name, module_info) in &self.symbols.modules {
self.register_module_types(module_name, &module_info.symbols);
}
}
/// Register types from a nested module recursively
fn register_module_types(&mut self, module_prefix: &str, module_symbols: &SymbolTable) {
// Register traits from this module with their real shape. Composed
// traits are filled in after all names exist, since composition can
// forward-reference traits in the same module.
let mut pending_trait_composition: Vec<(String, Vec<String>)> = Vec::new();
for (name, trait_info) in &module_symbols.traits {
let qualified_name = format!("{module_prefix}::{name}");
let generic_params = self.lower_generic_params(&trait_info.generics);
self.generic_scopes.push(generic_params.clone());
let fields: Vec<IrField> = trait_info
.fields
.iter()
.map(|f| IrField {
name: f.name.clone(),
ty: self.lower_type(&f.ty),
default: None,
optional: matches!(f.ty, ast::Type::Optional(_)),
mutable: false,
doc: f.doc.clone(),
convention: ast::ParamConvention::default(),
span: self.current_ir_span(),
})
.collect();
let methods: Vec<IrFunctionSig> = trait_info
.methods
.iter()
.map(|m| self.lower_fn_sig(m))
.collect();
self.generic_scopes.pop();
if let Err(e) = self.module.add_trait(
qualified_name.clone(),
IrTrait {
name: qualified_name.clone(),
visibility: trait_info.visibility,
composed_traits: Vec::new(),
fields,
methods,
generic_params,
doc: None,
span: self.current_ir_span(),
},
) {
self.errors.push(e);
}
if !trait_info.composed_traits.is_empty() {
pending_trait_composition
.push((qualified_name, trait_info.composed_traits.clone()));
}
}
// Resolve composed-trait references after all traits from this module
// have been registered.
for (qualified_name, composed_names) in pending_trait_composition {
let composed: Vec<TraitId> = composed_names
.iter()
.filter_map(|c| {
// Prefer the module-qualified lookup, fall back to simple
// name for traits composed from the enclosing scope.
self.module
.trait_id(&format!("{module_prefix}::{c}"))
.or_else(|| self.module.trait_id(c))
})
.collect();
if let Some(id) = self.module.trait_id(&qualified_name) {
if let Some(trait_def) = self.module.trait_mut(id) {
trait_def.composed_traits = composed;
}
}
}
// Register structs from this module
for (name, struct_info) in &module_symbols.structs {
let qualified_name = format!("{module_prefix}::{name}");
self.register_struct(&qualified_name, struct_info);
}
// Register enums from this module
for (name, enum_info) in &module_symbols.enums {
let qualified_name = format!("{module_prefix}::{name}");
self.register_enum(&qualified_name, enum_info);
}
// Recursively register nested modules
for (nested_name, nested_module_info) in &module_symbols.modules {
let nested_prefix = format!("{module_prefix}::{nested_name}");
self.register_module_types(&nested_prefix, &nested_module_info.symbols);
}
}
/// Helper method to register an enum using `EnumInfo::variant_fields`
/// so imported-module enums carry real variant shapes into the IR.
fn register_enum(&mut self, name: &str, enum_info: &EnumInfo) {
let generic_params = self.lower_generic_params(&enum_info.generics);
self.generic_scopes.push(generic_params.clone());
let variants: Vec<IrEnumVariant> = enum_info
.variants
.keys()
.map(|variant_name| {
let fields = enum_info
.variant_fields
.get(variant_name)
.map(|fs| {
fs.iter()
.map(|f| IrField {
name: f.name.clone(),
ty: self.lower_type(&f.ty),
default: None,
optional: matches!(f.ty, ast::Type::Optional(_)),
mutable: false,
doc: f.doc.clone(),
convention: ast::ParamConvention::default(),
span: self.current_ir_span(),
})
.collect()
})
.unwrap_or_default();
IrEnumVariant {
name: variant_name.clone(),
fields,
span: self.current_ir_span(),
}
})
.collect();
self.generic_scopes.pop();
if let Err(e) = self.module.add_enum(
name.to_string(),
IrEnum {
name: name.to_string(),
visibility: enum_info.visibility,
variants,
generic_params,
doc: None,
span: self.current_ir_span(),
},
) {
self.errors.push(e);
}
}
/// Helper method to register a struct with full field information
fn register_struct(&mut self, name: &str, struct_info: &StructInfo) {
// Convert generic params first so field types referencing `T`
// resolve as in-scope params instead of triggering an
// `UndefinedType` from the tightened `lower_type` fallback.
let generic_params = self.lower_generic_params(&struct_info.generics);
self.generic_scopes.push(generic_params.clone());
let fields: Vec<IrField> = struct_info
.fields
.iter()
.map(|f| {
let optional = matches!(f.ty, ast::Type::Optional(_));
IrField {
name: f.name.clone(),
ty: self.lower_type(&f.ty),
mutable: false,
optional,
default: None,
doc: f.doc.clone(),
convention: ast::ParamConvention::default(),
span: self.current_ir_span(),
}
})
.collect();
self.generic_scopes.pop();
// Convert trait names to IrTraitRef. The symbol table's
// get_all_traits_for_struct only carries trait names today,
// so we always lower these as non-generic refs (empty args);
// the impl-block path (lower_impl) is what produces
// populated args via ImplDef.trait_args.
let all_trait_names = self.symbols.get_all_traits_for_struct(name);
let traits: Vec<crate::ir::IrTraitRef> = all_trait_names
.iter()
.filter_map(|trait_name| {
self.module
.trait_id(trait_name)
.map(crate::ir::IrTraitRef::simple)
})
.collect();
if let Err(e) = self.module.add_struct(
name.to_string(),
IrStruct {
name: name.to_string(),
visibility: struct_info.visibility,
traits,
fields,
generic_params,
doc: None,
span: self.current_ir_span(),
},
) {
self.errors.push(e);
}
}
/// First pass: register definitions to allocate IDs
pub(super) fn register_definition(&mut self, def: &Definition) {
match def {
Definition::Trait(t) => {
let name = t.name.name.clone();
// Create placeholder, will be filled in second pass
if let Err(e) = self.module.add_trait(
name,
IrTrait {
name: t.name.name.clone(),
visibility: t.visibility,
composed_traits: Vec::new(),
fields: Vec::new(),
methods: Vec::new(),
generic_params: Vec::new(),
doc: t.doc.clone(),
span: self.current_ir_span(),
},
) {
self.errors.push(e);
}
}
Definition::Struct(s) => {
let name = s.name.name.clone();
if let Err(e) = self.module.add_struct(
name,
IrStruct {
name: s.name.name.clone(),
visibility: s.visibility,
traits: Vec::new(),
fields: Vec::new(),
generic_params: Vec::new(),
doc: s.doc.clone(),
span: self.current_ir_span(),
},
) {
self.errors.push(e);
}
}
Definition::Enum(e) => {
let name = e.name.name.clone();
if let Err(e) = self.module.add_enum(
name,
IrEnum {
name: e.name.name.clone(),
visibility: e.visibility,
variants: Vec::new(),
generic_params: Vec::new(),
doc: e.doc.clone(),
span: self.current_ir_span(),
},
) {
self.errors.push(e);
}
}
Definition::Impl(_) | Definition::Module(_) | Definition::Function(_) => {
// Impls are processed after structs.
// Modules: nested definitions are registered by register_module_types
// (called from register_imported_types before the first pass).
// Functions are processed in the second pass.
}
}
}
}