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

pass closure references along via TempOutput

Browse source
This commit is contained in:
Folkert 2022-04-23 20:59:34 +02:00
parent 8936cb9463
commit a4ea4acacf
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/can/src/def.rs
View file

@ -514,13 +514,6 @@ pub(crate) fn canonicalize_defs<'a>(
let mut def_ordering = DefOrdering::from_symbol_to_id(env.home, symbol_to_index, capacity); let mut def_ordering = DefOrdering::from_symbol_to_id(env.home, symbol_to_index, capacity);
for (def_id, pending_def) in pending_value_defs.into_iter().enumerate() { for (def_id, pending_def) in pending_value_defs.into_iter().enumerate() {
// if this def were a function, what would its name be?
let closure_symbol = match pending_def.loc_pattern().value {
Pattern::Identifier(symbol) => Some(symbol),
Pattern::AbilityMemberSpecialization { ident, .. } => Some(ident),
_ => None,
};
let temp_output = canonicalize_pending_value_def_new( let temp_output = canonicalize_pending_value_def_new(
env, env,
pending_def, pending_def,
@ -535,12 +528,10 @@ pub(crate) fn canonicalize_defs<'a>(
defs.push(Some(temp_output.def)); defs.push(Some(temp_output.def));
let closure_references = closure_symbol.and_then(|s| env.closures.get(&s));
def_ordering.insert_symbol_references( def_ordering.insert_symbol_references(
def_id as u32, def_id as u32,
&temp_output.references, &temp_output.references,
closure_references, temp_output.closure_references,
) )
} }
@ -753,7 +744,7 @@ impl DefOrdering {
&mut self, &mut self,
def_id: u32, def_id: u32,
references: &References, references: &References,
closure_references: Option<&References>, closure_references: Option<References>,
) { ) {
for referenced in references.value_lookups() { for referenced in references.value_lookups() {
if let Some(ref_id) = self.get_id(*referenced) { if let Some(ref_id) = self.get_id(*referenced) {
@ -1201,6 +1192,7 @@ struct TempOutput {
output: Output, output: Output,
def: Def, def: Def,
references: References, references: References,
closure_references: Option<References>,
} }
// TODO trim down these arguments! // TODO trim down these arguments!
@ -1318,6 +1310,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: References::default(), references: References::default(),
closure_references: None,
def, def,
} }
} }
@ -1398,6 +1391,8 @@ fn canonicalize_pending_value_def_new<'a>(
) )
}); });
let closure_references = references.clone();
// Re-insert the closure into the map, under its defined name. // Re-insert the closure into the map, under its defined name.
// closures don't have a name, and therefore pick a fresh symbol. But in this // closures don't have a name, and therefore pick a fresh symbol. But in this
// case, the closure has a proper name (e.g. `foo` in `foo = \x y -> ...` // case, the closure has a proper name (e.g. `foo` in `foo = \x y -> ...`
@ -1443,6 +1438,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: refs, references: refs,
closure_references: Some(closure_references),
def, def,
} }
} else { } else {
@ -1461,6 +1457,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: refs, references: refs,
closure_references: None,
def, def,
} }
} }
@ -1480,6 +1477,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: refs, references: refs,
closure_references: None,
def, def,
} }
} }
@ -1541,6 +1539,8 @@ fn canonicalize_pending_value_def_new<'a>(
) )
}); });
let closure_references = references.clone();
// Re-insert the closure into the map, under its defined name. // Re-insert the closure into the map, under its defined name.
// closures don't have a name, and therefore pick a fresh symbol. But in this // closures don't have a name, and therefore pick a fresh symbol. But in this
// case, the closure has a proper name (e.g. `foo` in `foo = \x y -> ...` // case, the closure has a proper name (e.g. `foo` in `foo = \x y -> ...`
@ -1583,6 +1583,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: refs, references: refs,
closure_references: Some(closure_references),
def, def,
} }
} else { } else {
@ -1601,6 +1602,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: refs, references: refs,
closure_references: None,
def, def,
} }
} }
@ -1620,6 +1622,7 @@ fn canonicalize_pending_value_def_new<'a>(
TempOutput { TempOutput {
output, output,
references: refs, references: refs,
closure_references: None,
def, def,
} }
} }