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

Use config_shorthand of "" but never a shorthand of ""

Browse source 
This was breaking bindgen's ability to work on some platform modules.
This commit is contained in:
Richard Feldman 2022-07-13 17:03:32 -04:00
parent af39bc5369
commit b734986fc8
No known key found for this signature in database
GPG key ID: 7E4127D1E4241798
1 changed files with 29 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

51
crates/compiler/load_internal/src/file.rs
View file

@ -2839,7 +2839,7 @@ fn load_platform_module<'a>(
// make a `platform` module that ultimately exposes `main` to the host // make a `platform` module that ultimately exposes `main` to the host
let platform_module_msg = fabricate_platform_module( let platform_module_msg = fabricate_platform_module(
arena, arena,
shorthand, Some(shorthand),
Some(app_module_id), Some(app_module_id),
filename.to_path_buf(), filename.to_path_buf(),
parser_state, parser_state,
@ -3237,19 +3237,17 @@ fn parse_header<'a>(
To::NewPackage(_package_name) => Ok((module_id, app_module_header_msg)), To::NewPackage(_package_name) => Ok((module_id, app_module_header_msg)),
} }
} }
Ok((ast::Module::Platform { header }, parse_state)) => { Ok((ast::Module::Platform { header }, parse_state)) => Ok(fabricate_platform_module(
Ok(fabricate_platform_module( arena,
arena, None,
"", // Use a shorthand of "" - it will be fine for `roc check` and bindgen None,
None, filename,
filename, parse_state,
parse_state, module_ids.clone(),
module_ids.clone(), ident_ids_by_module,
ident_ids_by_module, &header,
&header, module_timing,
module_timing, )),
))
}
Err(fail) => Err(LoadingProblem::ParsingFailed( Err(fail) => Err(LoadingProblem::ParsingFailed(
fail.map_problem(SyntaxError::Header) fail.map_problem(SyntaxError::Header)
@ -3534,7 +3532,7 @@ fn send_header<'a>(
struct PlatformHeaderInfo<'a> { struct PlatformHeaderInfo<'a> {
filename: PathBuf, filename: PathBuf,
is_root_module: bool, is_root_module: bool,
shorthand: &'a str, opt_shorthand: Option<&'a str>,
opt_app_module_id: Option<ModuleId>, opt_app_module_id: Option<ModuleId>,
packages: &'a [Loc<PackageEntry<'a>>], packages: &'a [Loc<PackageEntry<'a>>],
provides: &'a [Loc<ExposedName<'a>>], provides: &'a [Loc<ExposedName<'a>>],
@ -3554,7 +3552,7 @@ fn send_header_two<'a>(
) -> (ModuleId, Msg<'a>) { ) -> (ModuleId, Msg<'a>) {
let PlatformHeaderInfo { let PlatformHeaderInfo {
filename, filename,
shorthand, opt_shorthand,
is_root_module, is_root_module,
opt_app_module_id, opt_app_module_id,
packages, packages,
@ -3609,7 +3607,10 @@ fn send_header_two<'a>(
let mut module_ids = (*module_ids).lock(); let mut module_ids = (*module_ids).lock();
let mut ident_ids_by_module = (*ident_ids_by_module).lock(); let mut ident_ids_by_module = (*ident_ids_by_module).lock();
let name = PQModuleName::Qualified(shorthand, declared_name); let name = match opt_shorthand {
Some(shorthand) => PQModuleName::Qualified(shorthand, declared_name),
None => PQModuleName::Unqualified(declared_name),
};
home = module_ids.get_or_insert(&name); home = module_ids.get_or_insert(&name);
// Ensure this module has an entry in the exposed_ident_ids map. // Ensure this module has an entry in the exposed_ident_ids map.
@ -3623,8 +3624,13 @@ fn send_header_two<'a>(
for (qualified_module_name, exposed_idents, region) in imported.into_iter() { for (qualified_module_name, exposed_idents, region) in imported.into_iter() {
let cloned_module_name = qualified_module_name.module.clone(); let cloned_module_name = qualified_module_name.module.clone();
let pq_module_name = match qualified_module_name.opt_package { let pq_module_name = match qualified_module_name.opt_package {
None => PQModuleName::Qualified(shorthand, qualified_module_name.module), None => match opt_shorthand {
Some(package) => PQModuleName::Qualified(package, cloned_module_name.clone()), Some(shorthand) => {
PQModuleName::Qualified(shorthand, qualified_module_name.module)
}
None => PQModuleName::Unqualified(qualified_module_name.module),
},
Some(package) => PQModuleName::Qualified(package, cloned_module_name),
}; };
let module_id = module_ids.get_or_insert(&pq_module_name); let module_id = module_ids.get_or_insert(&pq_module_name);
@ -3733,7 +3739,8 @@ fn send_header_two<'a>(
}; };
let extra = HeaderFor::Platform { let extra = HeaderFor::Platform {
config_shorthand: shorthand, // A config_shorthand of "" should be fine
config_shorthand: opt_shorthand.unwrap_or_default(),
platform_main_type: requires[0].value, platform_main_type: requires[0].value,
main_for_host, main_for_host,
}; };
@ -4187,7 +4194,7 @@ fn unspace<'a, T: Copy>(arena: &'a Bump, items: &[Loc<Spaced<'a, T>>]) -> &'a [L
#[allow(clippy::too_many_arguments)] #[allow(clippy::too_many_arguments)]
fn fabricate_platform_module<'a>( fn fabricate_platform_module<'a>(
arena: &'a Bump, arena: &'a Bump,
shorthand: &'a str, opt_shorthand: Option<&'a str>,
opt_app_module_id: Option<ModuleId>, opt_app_module_id: Option<ModuleId>,
filename: PathBuf, filename: PathBuf,
parse_state: roc_parse::state::State<'a>, parse_state: roc_parse::state::State<'a>,
@ -4203,7 +4210,7 @@ fn fabricate_platform_module<'a>(
let info = PlatformHeaderInfo { let info = PlatformHeaderInfo {
filename, filename,
is_root_module, is_root_module,
shorthand, opt_shorthand,
opt_app_module_id, opt_app_module_id,
packages: &[], packages: &[],
provides: unspace(arena, header.provides.items), provides: unspace(arena, header.provides.items),