language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

refactor

Browse source
This commit is contained in:
Folkert 2021-07-16 20:52:47 +02:00
parent 71232524eb
commit c9809fff2a
1 changed files with 26 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

91
compiler/mono/src/alias_analysis.rs
View file

@ -954,17 +954,41 @@ fn expr_spec<'a>(
} => { } => {
let variant_types = build_variant_types(builder, tag_layout)?; let variant_types = build_variant_types(builder, tag_layout)?;
match tag_layout {
UnionLayout::NonRecursive(_) => {
let value_id = build_tuple_value(builder, env, block, arguments)?;
builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)
}
UnionLayout::Recursive(_) => {
let data_id = build_tuple_value(builder, env, block, arguments)?; let data_id = build_tuple_value(builder, env, block, arguments)?;
let cell_id = builder.add_new_heap_cell(block)?; let cell_id = builder.add_new_heap_cell(block)?;
let value_id = match tag_layout {
UnionLayout::NonRecursive(_) => {
let value_id = build_tuple_value(builder, env, block, arguments)?;
return builder.add_make_union(block, &variant_types, *tag_id as u32, value_id);
}
UnionLayout::NonNullableUnwrapped(_) => {
let value_id = builder.add_make_tuple(block, &[cell_id, data_id])?; let value_id = builder.add_make_tuple(block, &[cell_id, data_id])?;
let type_name_bytes = recursive_tag_union_name_bytes(tag_layout).as_bytes();
let type_name = TypeName(&type_name_bytes);
env.type_names.insert(*tag_layout);
return builder.add_make_named(block, MOD_APP, type_name, value_id);
}
UnionLayout::Recursive(_) => builder.add_make_tuple(block, &[cell_id, data_id])?,
UnionLayout::NullableWrapped { nullable_id, .. } => {
if *tag_id == *nullable_id as u8 {
data_id
} else {
builder.add_make_tuple(block, &[cell_id, data_id])?
}
}
UnionLayout::NullableUnwrapped { nullable_id, .. } => {
if *tag_id == *nullable_id as u8 {
data_id
} else {
builder.add_make_tuple(block, &[cell_id, data_id])?
}
}
};
let union_id = let union_id =
builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)?; builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)?;
@ -975,61 +999,6 @@ fn expr_spec<'a>(
builder.add_make_named(block, MOD_APP, type_name, union_id) builder.add_make_named(block, MOD_APP, type_name, union_id)
} }
UnionLayout::NonNullableUnwrapped(_) => {
let data_id = build_tuple_value(builder, env, block, arguments)?;
let cell_id = builder.add_new_heap_cell(block)?;
let value_id = builder.add_make_tuple(block, &[cell_id, data_id])?;
let type_name_bytes = recursive_tag_union_name_bytes(tag_layout).as_bytes();
let type_name = TypeName(&type_name_bytes);
env.type_names.insert(*tag_layout);
builder.add_make_named(block, MOD_APP, type_name, value_id)
}
UnionLayout::NullableWrapped { nullable_id, .. } => {
let union_id = if *tag_id == *nullable_id as u8 {
let value_id = builder.add_make_tuple(block, &[])?;
builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)?
} else {
let data_id = build_tuple_value(builder, env, block, arguments)?;
let cell_id = builder.add_new_heap_cell(block)?;
let value_id = builder.add_make_tuple(block, &[cell_id, data_id])?;
builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)?
};
let type_name_bytes = recursive_tag_union_name_bytes(tag_layout).as_bytes();
let type_name = TypeName(&type_name_bytes);
env.type_names.insert(*tag_layout);
builder.add_make_named(block, MOD_APP, type_name, union_id)
}
UnionLayout::NullableUnwrapped { nullable_id, .. } => {
let union_id = if *tag_id == *nullable_id as u8 {
let value_id = builder.add_make_tuple(block, &[])?;
builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)?
} else {
let data_id = build_tuple_value(builder, env, block, arguments)?;
let cell_id = builder.add_new_heap_cell(block)?;
let value_id = builder.add_make_tuple(block, &[cell_id, data_id])?;
builder.add_make_union(block, &variant_types, *tag_id as u32, value_id)?
};
let type_name_bytes = recursive_tag_union_name_bytes(tag_layout).as_bytes();
let type_name = TypeName(&type_name_bytes);
env.type_names.insert(*tag_layout);
builder.add_make_named(block, MOD_APP, type_name, union_id)
}
}
}
Struct(fields) => build_tuple_value(builder, env, block, fields), Struct(fields) => build_tuple_value(builder, env, block, fields),
UnionAtIndex { UnionAtIndex {
index, index,