Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 21 additions & 1 deletion sway-core/src/type_system/id.rs
Original file line number Diff line number Diff line change
Expand Up @@ -244,6 +244,17 @@ impl MaterializeConstGenerics for TypeId {
.te()
.insert_ref(engines, *to_mutable_value, referenced_type);
}
TypeInfo::Alias {
name: alias_name,
ty,
} => {
let alias_name = alias_name.clone();
let mut ty = ty.clone();
ty.type_id
.materialize_const_generics(engines, handler, name, value)?;

*self = engines.te().new_alias(engines, alias_name, ty);
}
_ => {}
}

Expand Down Expand Up @@ -596,7 +607,7 @@ impl TypeId {
}
}
// Primitive types have "implicit" type parameters
(TypeInfo::Array(ty, _), TypeInfo::Array(orig_ty, _)) => {
(TypeInfo::Array(ty, len), TypeInfo::Array(orig_ty, orig_len)) => {
type_parameters.push((ty.type_id, orig_ty.type_id));
ty.type_id.extract_type_parameters(
handler,
Expand All @@ -606,6 +617,15 @@ impl TypeId {
const_generic_parameters,
orig_ty.type_id,
);

if let ConstGenericExpr::AmbiguousVariableExpression { ident, .. } = &orig_len.0 {
if let ConstGenericExpr::Literal { .. } = &len.0 {
const_generic_parameters.insert(
ident.as_str().to_string(),
len.0.to_ty_expression(engines),
);
}
}
}
(TypeInfo::Alias { name: _, ty }, _) => {
ty.type_id.extract_type_parameters(
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[[package]]
name = "std"
source = "path+from-root-BCE5F39600308AA6"

[[package]]
name = "type_alias_array_const_generics"
source = "member"
dependencies = ["std"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
[project]
authors = ["Fuel Labs <contact@fuel.sh>"]
entry = "main.sw"
license = "Apache-2.0"
name = "type_alias_array_const_generics"

[dependencies]
std = { path = "../../../../../../../sway-lib-std" }
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
script;

type ArrayU8Len2 = [u8; 2];
type ArrayNestedLen3 = [ArrayU8Len2; 3];

struct MyStruct {
f_array: ArrayU8Len2,
f_nested: ArrayNestedLen3,
}

fn main() -> u64 {
let a = MyStruct {
f_array: [1u8, 2u8],
f_nested: [[1u8, 2u8], [3u8, 4u8], [5u8, 6u8]],
};
let b = MyStruct {
f_array: [1u8, 2u8],
f_nested: [[1u8, 2u8], [3u8, 4u8], [5u8, 6u8]],
};

assert(a.f_array == b.f_array);
assert(a.f_nested == b.f_nested);

let mut v: Vec<ArrayU8Len2> = Vec::new();
v.push([10u8, 20u8]);
let got: ArrayU8Len2 = v.get(0).unwrap();
assert(got[0] == 10u8);
assert(got[1] == 20u8);

1
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
category = "run"
expected_result = { action = "return", value = 1 }
expected_result_new_encoding = { action = "return_data", value = "0000000000000001" }
validate_abi = false
expected_warnings = 1