language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-01 07:41:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix some empty list edge cases

Browse source
This commit is contained in:
Richard Feldman 2020-06-25 00:02:52 -04:00
parent 5cec577427
commit 0550af17d2
3 changed files with 113 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

48
compiler/mono/src/expr.rs
View file

@ -1,4 +1,4 @@
use crate::layout::{Builtin, Layout, LayoutCache, LayoutProblem};
use crate::layout::{list_layout_from_elem, Builtin, Layout, LayoutCache, LayoutProblem};
use crate::pattern::{Ctor, Guard, RenderAs, TagId};
use bumpalo::collections::Vec;
use bumpalo::Bump;
@ -278,6 +278,7 @@ pub enum Expr<'a> {
elem_layout: Layout<'a>,
elems: &'a [Expr<'a>],
},
EmptyArray,
RuntimeError(&'a str),
}
@ -782,31 +783,30 @@ fn from_can<'a>(
} => {
let arena = env.arena;
let subs = &env.subs;
let elem_content = subs.get_without_compacting(elem_var).content;
let elem_layout = match elem_content {
// We have to special-case the empty list, because trying to
// compute a layout for an unbound var won't work.
Content::FlexVar(_) => Layout::Builtin(Builtin::EmptyList),
_ => match layout_cache.from_var(arena, elem_var, env.subs, env.pointer_size) {
Ok(layout) => layout.clone(),
Err(problem) => {
todo!(
"gracefully handle List with element layout problem: {:?}",
problem
);
match list_layout_from_elem(arena, subs, elem_var, env.pointer_size) {
Ok(Layout::Builtin(Builtin::EmptyList)) => Expr::EmptyArray,
Ok(Layout::Builtin(Builtin::List(elem_layout))) => {
let mut elems = Vec::with_capacity_in(loc_elems.len(), arena);
for loc_elem in loc_elems {
elems.push(from_can(env, loc_elem.value, procs, layout_cache));
}
},
};
let mut elems = Vec::with_capacity_in(loc_elems.len(), arena);
for loc_elem in loc_elems {
elems.push(from_can(env, loc_elem.value, procs, layout_cache));
}
Expr::Array {
elem_layout,
elems: elems.into_bump_slice(),
Expr::Array {
elem_layout: elem_layout.clone(),
elems: elems.into_bump_slice(),
}
}
Ok(_) => {
unreachable!();
}
Err(problem) => {
todo!(
"gracefully handle List with element layout problem: {:?}",
problem
);
}
}
}
Accessor { .. } => todo!("record accessor"),