Skip to content

Commit 4b807af

Browse files
committed
Small fixes
1 parent 386dcf1 commit 4b807af

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

src/assembly.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -259,6 +259,7 @@ impl Assembly {
259259
let local_ty = monomorphize(&instance, local.ty, tcx);
260260
self.add_type(local_ty, tcx, &instance);
261261
}
262+
println!("Compiled method {name}");
262263
self.add_method(method);
263264
Ok(())
264265
//todo!("Can't add function")

src/type.rs

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -324,7 +324,9 @@ impl Type {
324324
todo!("Generic fn defs unsuported!")
325325
}
326326
TyKind::Array(element, length) => {
327-
let length = crate::utilis::try_resolve_const_size(length).unwrap();
327+
328+
//TODO: array size *COULD* be generic. This is not handled yet.
329+
let length = crate::utilis::try_resolve_const_size(length).expect("Generic array size.");
328330

329331
let element = Type::generic_from_ty(*element, tyctx);
330332
DotnetTypeRef::array(element, length).into()
@@ -430,8 +432,8 @@ impl Type {
430432
Self::FnDef(call)
431433
}
432434
TyKind::Array(element, length) => {
433-
//let length = crate::utilis::monomorphize(method, length, tyctx)
434-
let length = crate::utilis::try_resolve_const_size(length).unwrap();
435+
let length = crate::utilis::monomorphize(method, *length, tyctx);
436+
let length = crate::utilis::try_resolve_const_size(&length).unwrap();
435437

436438
let element = Type::from_ty(*element, tyctx, method);
437439
DotnetTypeRef::array(element, length).into()

src/utilis.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ pub fn generic_field_ty<'ctx>(
111111
.did,
112112
)
113113
.instantiate_identity();
114-
println!("Generic field type {ty:?}");
114+
//println!("Generic field type {ty:?}");
115115
crate::r#type::Type::from_ty(ty, ctx, &method_instance)
116116
}
117117
TyKind::Tuple(_) => crate::r#type::Type::GenericArg(field_idx),
@@ -126,7 +126,7 @@ pub fn enum_tag_size(variants: u64) -> u32 {
126126
pub fn tag_from_enum_variants(variants: u64) -> crate::r#type::Type {
127127
use crate::r#type::Type;
128128
let var_size = enum_tag_size(variants);
129-
println!("variants:{variants}tag_size:{var_size}");
129+
// println!("variants:{variants}tag_size:{var_size}");
130130
match var_size {
131131
0 => Type::Void,
132132
1 => Type::U8,

0 commit comments

Comments
 (0)