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

Pass in builtin look up function parameter

Browse source
This commit is contained in:
Chadtech 2021-01-18 21:25:10 -05:00
parent fdff20b2c1
commit dd2dcc63d1
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
compiler/can/src/module.rs
View file

@ -41,7 +41,7 @@ pub struct ModuleOutput {
// TODO trim these down // TODO trim these down
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
pub fn canonicalize_module_defs<'a>( pub fn canonicalize_module_defs<'a, F>(
arena: &Bump, arena: &Bump,
loc_defs: &'a [Located<ast::Def<'a>>], loc_defs: &'a [Located<ast::Def<'a>>],
home: ModuleId, home: ModuleId,
@ -52,7 +52,11 @@ pub fn canonicalize_module_defs<'a>(
exposed_imports: MutMap<Ident, (Symbol, Region)>, exposed_imports: MutMap<Ident, (Symbol, Region)>,
exposed_symbols: &MutSet<Symbol>, exposed_symbols: &MutSet<Symbol>,
var_store: &mut VarStore, var_store: &mut VarStore,
) -> Result<ModuleOutput, RuntimeError> { look_up_builtin: F,
) -> Result<ModuleOutput, RuntimeError>
where
F: Fn(Symbol, &mut VarStore) -> Option<Def>,
{
let mut can_exposed_imports = MutMap::default(); let mut can_exposed_imports = MutMap::default();
let mut scope = Scope::new(home, var_store); let mut scope = Scope::new(home, var_store);
let num_deps = dep_idents.len(); let num_deps = dep_idents.len();
@ -284,7 +288,7 @@ pub fn canonicalize_module_defs<'a>(
for symbol in references.iter() { for symbol in references.iter() {
if symbol.is_builtin() { if symbol.is_builtin() {
// this can fail when the symbol is for builtin types, or has no implementation yet // this can fail when the symbol is for builtin types, or has no implementation yet
if let Some(def) = builtins::builtin_defs_map(*symbol, var_store) { if let Some(def) = look_up_builtin(*symbol, var_store) {
declarations.push(Declaration::Builtin(def)); declarations.push(Declaration::Builtin(def));
} }
} }

2
compiler/load/src/file.rs
View file

@ -5,6 +5,7 @@ use crossbeam::deque::{Injector, Stealer, Worker};
use crossbeam::thread; use crossbeam::thread;
use parking_lot::Mutex; use parking_lot::Mutex;
use roc_builtins::std::{Mode, StdLib}; use roc_builtins::std::{Mode, StdLib};
use roc_can::builtins::builtin_defs_map;
use roc_can::constraint::Constraint; use roc_can::constraint::Constraint;
use roc_can::def::Declaration; use roc_can::def::Declaration;
use roc_can::module::{canonicalize_module_defs, Module}; use roc_can::module::{canonicalize_module_defs, Module};
@ -3202,6 +3203,7 @@ fn canonicalize_and_constrain<'a>(
exposed_imports, exposed_imports,
&exposed_symbols, &exposed_symbols,
&mut var_store, &mut var_store,
builtin_defs_map,
); );
let canonicalize_end = SystemTime::now(); let canonicalize_end = SystemTime::now();