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

Only immediately specialize anonymous closures

Browse source
This commit is contained in:
Richard Feldman 2020-06-21 14:21:16 -04:00
parent 0d6d30e5df
commit 7c98e2e9f8
2 changed files with 9 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

2
compiler/build/src/program.rs
View file

@ -39,7 +39,6 @@ pub fn build(
let home = loaded.module_id; let home = loaded.module_id;
let src_lines: Vec<&str> = src.split('\n').collect(); let src_lines: Vec<&str> = src.split('\n').collect();
let palette = DEFAULT_PALETTE; let palette = DEFAULT_PALETTE;
let mut layout_cache = LayoutCache::default();
// Report parsing and canonicalization problems // Report parsing and canonicalization problems
let alloc = RocDocAllocator::new(&src_lines, home, &loaded.interns); let alloc = RocDocAllocator::new(&src_lines, home, &loaded.interns);
@ -197,7 +196,6 @@ pub fn build(
loc_args, loc_args,
loc_body, loc_body,
ret_var, ret_var,
&mut layout_cache,
); );
} }
body => { body => {

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

@ -50,26 +50,13 @@ impl<'a> Procs<'a> {
loc_args: std::vec::Vec<(Variable, Located<roc_can::pattern::Pattern>)>, loc_args: std::vec::Vec<(Variable, Located<roc_can::pattern::Pattern>)>,
loc_body: Located<roc_can::expr::Expr>, loc_body: Located<roc_can::expr::Expr>,
ret_var: Variable, ret_var: Variable,
layout_cache: &mut LayoutCache<'a>,
) { ) {
let (pattern_vars, pattern_symbols, body) = let (_, pattern_symbols, body) = patterns_to_when(env, loc_args, ret_var, loc_body);
patterns_to_when(env, loc_args, ret_var, loc_body);
let layout = layout_cache // a named closure. Since these aren't specialized by the surrounding
.from_var(env.arena, annotation, env.subs, env.pointer_size) // context, we can't add pending specializations for them yet.
.unwrap_or_else(|err| panic!("TODO turn fn_var into a RuntimeError {:?}", err)); // (If we did, all named polymorphic functions would immediately error
// on trying to convert a flex var to a Layout.)
let pending = PendingSpecialization {
ret_var,
fn_var: annotation,
pattern_vars,
};
self.add_pending_specialization(name, layout.clone(), pending);
debug_assert!(!self.partial_procs.contains_key(&name), "Procs was told to insert a value for key {:?}, but there was already an entry for that key! Procs should never attempt to insert duplicates.", name);
// a named closure
self.partial_procs.insert( self.partial_procs.insert(
name, name,
PartialProc { PartialProc {
@ -95,6 +82,9 @@ impl<'a> Procs<'a> {
let (pattern_vars, pattern_symbols, body) = let (pattern_vars, pattern_symbols, body) =
patterns_to_when(env, loc_args, ret_var, loc_body); patterns_to_when(env, loc_args, ret_var, loc_body);
// an anonymous closure. These will always be specialized already
// by the surrounding context, so we can add pending specializations
// for them immediately.
let layout = layout_cache let layout = layout_cache
.from_var(env.arena, annotation, env.subs, env.pointer_size) .from_var(env.arena, annotation, env.subs, env.pointer_size)
.unwrap_or_else(|err| panic!("TODO turn fn_var into a RuntimeError {:?}", err)); .unwrap_or_else(|err| panic!("TODO turn fn_var into a RuntimeError {:?}", err));
@ -1102,15 +1092,7 @@ fn from_can_defs<'a>(
let (loc_body, ret_var) = *boxed_body; let (loc_body, ret_var) = *boxed_body;
procs.insert_named( procs.insert_named(env, *symbol, ann, loc_args, loc_body, ret_var);
env,
*symbol,
ann,
loc_args,
loc_body,
ret_var,
layout_cache,
);
continue; continue;
} }