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

special-case effect modules so they are not parsed

Browse source
This commit is contained in:
Folkert 2020-12-06 21:51:08 +01:00
parent 1471cd0db4
commit 0873792488
1 changed files with 9 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -103,6 +103,7 @@ impl Dependencies {
pub fn add_module( pub fn add_module(
&mut self, &mut self,
module_id: ModuleId, module_id: ModuleId,
opt_effect_module: Option<ModuleId>,
dependencies: &MutSet<ModuleId>, dependencies: &MutSet<ModuleId>,
goal_phase: Phase, goal_phase: Phase,
) -> MutSet<(ModuleId, Phase)> { ) -> MutSet<(ModuleId, Phase)> {
@ -145,7 +146,8 @@ impl Dependencies {
// all the dependencies can be loaded // all the dependencies can be loaded
for dep in dependencies { for dep in dependencies {
// TODO figure out how to "load" (because it doesn't exist on the file system) the Effect module // TODO figure out how to "load" (because it doesn't exist on the file system) the Effect module
if !format!("{:?}", dep).contains("Effect") {
if Some(*dep) != opt_effect_module {
output.insert((*dep, LoadHeader)); output.insert((*dep, LoadHeader));
} }
} }
@ -680,6 +682,7 @@ struct State<'a> {
pub stdlib: StdLib, pub stdlib: StdLib,
pub exposed_types: SubsByModule, pub exposed_types: SubsByModule,
pub output_path: Option<&'a str>, pub output_path: Option<&'a str>,
pub opt_effect_module: Option<ModuleId>,
pub headers_parsed: MutSet<ModuleId>, pub headers_parsed: MutSet<ModuleId>,
@ -1264,6 +1267,7 @@ where
goal_phase, goal_phase,
stdlib, stdlib,
output_path: None, output_path: None,
opt_effect_module: None,
module_cache: ModuleCache::default(), module_cache: ModuleCache::default(),
dependencies: Dependencies::default(), dependencies: Dependencies::default(),
procedures: MutMap::default(), procedures: MutMap::default(),
@ -1429,6 +1433,7 @@ fn update<'a>(
let work = state.dependencies.add_module( let work = state.dependencies.add_module(
header.module_id, header.module_id,
state.opt_effect_module,
&header.imported_modules, &header.imported_modules,
state.goal_phase, state.goal_phase,
); );
@ -1516,6 +1521,9 @@ fn update<'a>(
module_docs, module_docs,
} => { } => {
let module_id = constrained_module.module.module_id; let module_id = constrained_module.module.module_id;
state.opt_effect_module = Some(module_id);
log!("made effect module for {:?}", module_id); log!("made effect module for {:?}", module_id);
state state
.module_cache .module_cache