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

Return params in params_extended_home_symbol

Browse source
This commit is contained in:
Agus Zubiaga 2024-08-27 00:32:35 -03:00
parent 3c6a2f11d7
commit 6cffe9b1db
No known key found for this signature in database
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

14
crates/compiler/lower_params/src/lower.rs
View file

@ -119,9 +119,7 @@ impl<'a> LowerParams<'a> {
}
}
Var(symbol, var) => {
if let Some(arity) = self.params_extended_home_symbol(symbol) {
let params = self.home_params.as_ref().unwrap();
if let Some((params, arity)) = self.params_extended_home_symbol(symbol) {
*expr = self.lower_naked_params_var(
*arity,
*symbol,
@ -154,9 +152,8 @@ impl<'a> LowerParams<'a> {
fun.1.value = Var(symbol, var);
}
Var(symbol, _var) => {
if self.params_extended_home_symbol(&symbol).is_some() {
if let Some((params, _)) = self.params_extended_home_symbol(&symbol) {
// Calling a top-level function in the current module with params
let params = self.home_params.as_ref().unwrap();
args.push((
params.whole_var,
Loc::at_zero(Var(params.whole_symbol, params.whole_var)),
@ -366,10 +363,13 @@ impl<'a> LowerParams<'a> {
Symbol::new(self.home_id, self.ident_ids.gen_unique())
}
fn params_extended_home_symbol(&self, symbol: &Symbol) -> Option<&usize> {
fn params_extended_home_symbol(&self, symbol: &Symbol) -> Option<(&ModuleParams, &usize)> {
if symbol.module_id() == self.home_id {
match self.home_params {
Some(params) => params.arity_by_name.get(&symbol.ident_id()),
Some(params) => match params.arity_by_name.get(&symbol.ident_id()) {
Some(arity) => Some((params, arity)),
None => None,
},
None => None,
}
} else {