language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-03 08:34:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

pattern match on single-tag tag unions

Browse source 
in LLVM and crane
This commit is contained in:
Folkert 2020-03-17 19:44:59 +01:00
parent b5abed5f54
commit 6253d2d1af
4 changed files with 60 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/gen/src/llvm/build.rs
View file

@ -11,7 +11,7 @@ use inkwell::{AddressSpace, FloatPredicate, IntPredicate};
use crate::llvm::convert::{
basic_type_from_layout, collection_wrapper, get_array_type, get_fn_type,
};
use roc_collections::all::{ImMap, MutMap};
use roc_collections::all::ImMap;
use roc_module::symbol::{Interns, Symbol};
use roc_mono::expr::{Expr, Proc, Procs};
use roc_mono::layout::{Builtin, Layout};
@ -316,11 +316,10 @@ pub fn build_expr<'a, 'ctx, 'env>(
BasicValueEnum::StructValue(struct_val.into_struct_value())
}
Tag {
tag_id,
union_size,
arguments,
tag_layout,
..
} => {
} if *union_size == 1 => {
/*
// put the discriminant in the first slot
let discriminant = (
@ -393,6 +392,16 @@ pub fn build_expr<'a, 'ctx, 'env>(
.build_extract_value(struct_val, index, "field_access")
.unwrap()
}
AccessAtIndex { index, expr, .. } => {
let builder = env.builder;
// Get Struct val
let struct_val = build_expr(env, &scope, parent, expr, procs).into_struct_value();
builder
.build_extract_value(struct_val, *index as u32, "tag_field_access")
.unwrap()
}
_ => {
panic!("I don't yet know how to LLVM build {:?}", expr);
}

4
compiler/gen/src/llvm/convert.rs
View file

@ -69,7 +69,7 @@ pub fn basic_type_from_layout<'ctx>(
.as_basic_type_enum()
}
Union(tags) if tags.len() == 1 => {
let (_, layouts) = tags.into_iter().next().unwrap();
let (_, layouts) = tags.iter().next().unwrap();
// Determine types
let mut field_types = Vec::with_capacity_in(layouts.len(), arena);
@ -82,7 +82,7 @@ pub fn basic_type_from_layout<'ctx>(
.struct_type(field_types.into_bump_slice(), false)
.as_basic_type_enum()
}
Union(tags) => {
Union(_) => {
// TODO make this dynamic
let ptr_size = std::mem::size_of::<i64>();
let union_size = layout.stack_size(ptr_size as u32);