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

chore: remove load pkg config from plain line

Browse source
This commit is contained in:
rvcas 2020-12-03 20:06:25 -05:00
parent 6d4ecc8023
commit 654a018106
1 changed files with 16 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -830,6 +830,7 @@ enum BuildTask<'a> {
}, },
LoadPkgConfig { LoadPkgConfig {
module_ids: Arc<Mutex<ModuleIds>>, module_ids: Arc<Mutex<ModuleIds>>,
package_module_ids: Arc<Mutex<PackageModuleIds<'a>>>,
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>, ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
mode: Mode, mode: Mode,
}, },
@ -1859,6 +1860,7 @@ fn load_pkg_config<'a>(
arena: &'a Bump, arena: &'a Bump,
src_dir: &Path, src_dir: &Path,
module_ids: Arc<Mutex<ModuleIds>>, module_ids: Arc<Mutex<ModuleIds>>,
package_module_ids: Arc<Mutex<PackageModuleIds>>,
ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>, ident_ids_by_module: Arc<Mutex<MutMap<ModuleId, IdentIds>>>,
mode: Mode, mode: Mode,
) -> Result<Msg<'a>, LoadingProblem> { ) -> Result<Msg<'a>, LoadingProblem> {
@ -2034,7 +2036,7 @@ fn parse_header<'a>(
header.imports.into_bump_slice(), header.imports.into_bump_slice(),
parse_state, parse_state,
module_ids.clone(), module_ids.clone(),
package_module_ids, package_module_ids.clone(),
ident_ids_by_module.clone(), ident_ids_by_module.clone(),
module_timing, module_timing,
); );
@ -2054,6 +2056,7 @@ fn parse_header<'a>(
Some(Located { Some(Located {
value: value:
PackageEntry::Entry { PackageEntry::Entry {
shorthand,
package_or_path: package_or_path:
Located { Located {
value: package_or_path, value: package_or_path,
@ -2076,6 +2079,7 @@ fn parse_header<'a>(
arena, arena,
&pkg_config_dir, &pkg_config_dir,
module_ids, module_ids,
package_module_ids,
ident_ids_by_module, ident_ids_by_module,
mode, mode,
)?; )?;
@ -2099,30 +2103,9 @@ fn parse_header<'a>(
} }
To::NewPackage(package_or_path) => match package_or_path { To::NewPackage(package_or_path) => match package_or_path {
PackageOrPath::Package(_, _) => panic!("TODO implement packages"), PackageOrPath::Package(_, _) => panic!("TODO implement packages"),
PackageOrPath::Path(StrLiteral::PlainLine(package)) => { PackageOrPath::Path(StrLiteral::PlainLine(_package)) => {
// check whether we can find a Pkg-Config.roc file
let mut pkg_config_roc = pkg_config_dir.clone();
pkg_config_roc.push(package);
pkg_config_roc.push(PKG_CONFIG_FILE_NAME);
pkg_config_roc.set_extension(ROC_FILE_EXTENSION);
if pkg_config_roc.as_path().exists() {
let load_pkg_config_msg = load_pkg_config(
arena,
&pkg_config_dir,
module_ids,
ident_ids_by_module,
mode,
)?;
Ok((
module_id,
Msg::Many(vec![app_module_header_msg, load_pkg_config_msg]),
))
} else {
Ok((module_id, app_module_header_msg)) Ok((module_id, app_module_header_msg))
} }
}
PackageOrPath::Path(StrLiteral::Block(_)) => { PackageOrPath::Path(StrLiteral::Block(_)) => {
panic!("TODO implement block package path") panic!("TODO implement block package path")
} }
@ -3220,9 +3203,17 @@ fn run_task<'a>(
.map(|(_, msg)| msg), .map(|(_, msg)| msg),
LoadPkgConfig { LoadPkgConfig {
module_ids, module_ids,
package_module_ids,
ident_ids_by_module, ident_ids_by_module,
mode, mode,
} => load_pkg_config(arena, src_dir, module_ids, ident_ids_by_module, mode), } => load_pkg_config(
arena,
src_dir,
module_ids,
package_module_ids,
ident_ids_by_module,
mode,
),
Parse { header } => parse(arena, header), Parse { header } => parse(arena, header),
CanonicalizeAndConstrain { CanonicalizeAndConstrain {
parsed, parsed,