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

refactor how global defs are registered

Browse source
This commit is contained in:
Folkert 2022-04-23 13:49:14 +02:00
parent c396ad6705
commit 2037133882
No known key found for this signature in database
GPG key ID: 1F17F6FFD112B97C
1 changed files with 12 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -480,20 +480,6 @@ pub fn canonicalize_defs<'a>(
) { ) {
None => { /* skip */ } None => { /* skip */ }
Some(pending_def) => { Some(pending_def) => {
// store the top-level defs, used to ensure that closures won't capture them
if let PatternType::TopLevelDef = pattern_type {
match &pending_def {
PendingValueDef::AnnotationOnly(_, loc_can_pattern, _)
| PendingValueDef::Body(_, loc_can_pattern, _)
| PendingValueDef::TypedBody(_, loc_can_pattern, _, _) => {
env.top_level_symbols.extend(
bindings_from_patterns(std::iter::once(loc_can_pattern))
.iter()
.map(|t| t.0),
)
}
}
}
// Record the ast::Expr for later. We'll do another pass through these // Record the ast::Expr for later. We'll do another pass through these
// once we have the entire scope assembled. If we were to canonicalize // once we have the entire scope assembled. If we were to canonicalize
// the exprs right now, they wouldn't have symbols in scope from defs // the exprs right now, they wouldn't have symbols in scope from defs
@ -504,19 +490,20 @@ pub fn canonicalize_defs<'a>(
} }
} }
// the bindings by all defs in the current block
let bindings = bindings_from_patterns(pending_value_defs.iter().map(|p| p.loc_pattern()));
let mut symbol_to_id: Vec<(IdentId, u32)> = Vec::with_capacity(pending_value_defs.len()); let mut symbol_to_id: Vec<(IdentId, u32)> = Vec::with_capacity(pending_value_defs.len());
for (binding_index, (s, _)) in bindings.into_iter().enumerate() {
// store the top-level defs, used to ensure that closures won't capture them
if let PatternType::TopLevelDef = pattern_type {
env.top_level_symbols.insert(s);
}
let mut def_count = 0;
for pending_def in pending_value_defs.iter() {
let pattern = &pending_def.loc_pattern().value;
for s in crate::pattern::symbols_from_pattern(pattern) {
debug_assert_eq!(env.home, s.module_id()); debug_assert_eq!(env.home, s.module_id());
debug_assert!(!symbol_to_id.iter().any(|(id, _)| *id == s.ident_id())); debug_assert!(!symbol_to_id.iter().any(|(id, _)| *id == s.ident_id()));
symbol_to_id.push((s.ident_id(), def_count)); symbol_to_id.push((s.ident_id(), binding_index as u32));
def_count += 1;
}
} }
let mut def_order = DefOrdering::from_symbol_to_id(env.home, symbol_to_id); let mut def_order = DefOrdering::from_symbol_to_id(env.home, symbol_to_id);