language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-28 22:34:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

fix todo

Browse source
This commit is contained in:
Folkert 2020-10-24 01:19:22 +02:00
parent 9d2a4a7d39
commit 2c0416907c
1 changed files with 13 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

17
compiler/mono/src/ir.rs
View file

@ -1712,8 +1712,8 @@ fn specialize_solved_type<'a>(
partial_proc: PartialProc<'a>, partial_proc: PartialProc<'a>,
) -> Result<(Proc<'a>, Layout<'a>), LayoutProblem> { ) -> Result<(Proc<'a>, Layout<'a>), LayoutProblem> {
// add the specializations that other modules require of us // add the specializations that other modules require of us
use roc_constrain::module::{to_type, FreeVars};
use roc_solve::solve::{insert_type_into_subs, instantiate_rigids}; use roc_solve::solve::{insert_type_into_subs, instantiate_rigids};
use roc_types::solved_types::{to_type, FreeVars};
use roc_types::subs::VarStore; use roc_types::subs::VarStore;
let snapshot = env.subs.snapshot(); let snapshot = env.subs.snapshot();
@ -1761,14 +1761,22 @@ struct FunctionLayouts<'a> {
} }
impl<'a> FunctionLayouts<'a> { impl<'a> FunctionLayouts<'a> {
pub fn from_layout(layout: Layout<'a>) -> Self { pub fn from_layout(arena: &'a Bump, layout: Layout<'a>) -> Self {
match &layout { match &layout {
Layout::FunctionPointer(arguments, result) => FunctionLayouts { Layout::FunctionPointer(arguments, result) => FunctionLayouts {
arguments, arguments,
result: (*result).clone(), result: (*result).clone(),
full: layout, full: layout,
}, },
Layout::Closure(_, _, _) => todo!(), Layout::Closure(arguments, closure_layout, result) => {
let full = ClosureLayout::extend_function_layout(
arena,
arguments,
closure_layout.clone(),
result,
);
FunctionLayouts::from_layout(arena, full)
}
_ => FunctionLayouts { _ => FunctionLayouts {
full: layout.clone(), full: layout.clone(),
arguments: &[], arguments: &[],
@ -4411,7 +4419,8 @@ fn call_by_name<'a>(
) { ) {
Ok((proc, layout)) => { Ok((proc, layout)) => {
debug_assert_eq!(full_layout, layout); debug_assert_eq!(full_layout, layout);
let function_layout = FunctionLayouts::from_layout(layout); let function_layout =
FunctionLayouts::from_layout(env.arena, layout);
procs.specialized.remove(&(proc_name, full_layout)); procs.specialized.remove(&(proc_name, full_layout));