language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-27 13:59:08 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

handle only one def that is Suffixed

Browse source
This commit is contained in:
Luke Boswell 2024-03-20 09:57:48 +11:00
parent c4b459b436
commit 248c2a3f34
No known key found for this signature in database
GPG key ID: F6DB3C9DB47377B0
1 changed files with 68 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

95
crates/compiler/can/src/desugar.rs
View file

@ -169,7 +169,39 @@ fn desugar_defs_node_suffixed<'a>(
loc_expr.value loc_expr.value
); );
loc_expr // Unwrap Suffixed def within Apply, and the pattern so we can use in the call to Task.await
let (suffixed_sub_apply_loc, pattern) = unwrap_suffixed_def_and_pattern(
arena,
loc_expr.region,
defs.value_defs[0],
);
// Create Closure for the result of the recursion,
// use the pattern from our Suffixed Def as closure arument
let closure_expr = Closure(arena.alloc([*pattern]), loc_ret);
// Apply arguments to Task.await, first is the unwrapped Suffix expr second is the Closure
let mut task_await_apply_args: Vec<&'a Loc<Expr<'a>>> = Vec::new_in(arena);
task_await_apply_args
.push(arena.alloc(Loc::at(loc_expr.region, suffixed_sub_apply_loc)));
task_await_apply_args
.push(arena.alloc(Loc::at(loc_expr.region, closure_expr)));
arena.alloc(Loc::at(
loc_expr.region,
Apply(
arena.alloc(Loc {
region: loc_expr.region,
value: Var {
module_name: ModuleName::TASK,
ident: "await",
},
}),
arena.alloc(task_await_apply_args),
CalledVia::Space,
),
))
} else if value_index == 0 { } else if value_index == 0 {
// We have a Suffixed in first index, and also other nodes in Defs // We have a Suffixed in first index, and also other nodes in Defs
// pop the first Suffixed and recurse on Defs (without first) to handle any other Suffixed // pop the first Suffixed and recurse on Defs (without first) to handle any other Suffixed
@ -186,32 +218,11 @@ fn desugar_defs_node_suffixed<'a>(
); );
// Unwrap Suffixed def within Apply, and the pattern so we can use in the call to Task.await // Unwrap Suffixed def within Apply, and the pattern so we can use in the call to Task.await
let (suffixed_sub_apply_loc, pattern) = match defs.value_defs[0] { let (suffixed_sub_apply_loc, pattern) = unwrap_suffixed_def_and_pattern(
ValueDef::Body(pattern, suffixed_expression) => { arena,
match suffixed_expression.value { loc_expr.region,
Apply(sub_loc, suffixed_args, called_via) => { defs.value_defs[0],
match sub_loc.value { );
Suffixed(sub_expr) => (
Apply(
arena
.alloc(Loc::at(loc_expr.region, *sub_expr)),
suffixed_args,
called_via,
),
pattern,
),
_ => unreachable!(
"should have a suffixed Apply inside Body def"
),
}
}
_ => {
unreachable!("should have a suffixed Apply inside Body def")
}
}
}
_ => unreachable!("should have a suffixed Body def"),
};
// Get a mutable copy of the defs // Get a mutable copy of the defs
let mut copied_defs = defs.clone(); let mut copied_defs = defs.clone();
@ -280,6 +291,36 @@ fn desugar_defs_node_suffixed<'a>(
} }
} }
// Unwrap Suffixed def within Apply, and the pattern so we can use in the call to Task.await
fn unwrap_suffixed_def_and_pattern<'a>(
arena: &'a Bump,
region: Region,
value_def: ValueDef<'a>,
) -> (
roc_parse::ast::Expr<'a>,
&'a Loc<roc_parse::ast::Pattern<'a>>,
) {
match value_def {
ValueDef::Body(pattern, suffixed_expression) => match suffixed_expression.value {
Apply(sub_loc, suffixed_args, called_via) => match sub_loc.value {
Suffixed(sub_expr) => (
Apply(
arena.alloc(Loc::at(region, *sub_expr)),
suffixed_args,
called_via,
),
pattern,
),
_ => unreachable!("should have a suffixed Apply inside Body def"),
},
_ => {
unreachable!("should have a suffixed Apply inside Body def")
}
},
_ => unreachable!("should have a suffixed Body def"),
}
}
/// Reorder the expression tree based on operator precedence and associativity rules, /// Reorder the expression tree based on operator precedence and associativity rules,
/// then replace the BinOp nodes with Apply nodes. Also drop SpaceBefore and SpaceAfter nodes. /// then replace the BinOp nodes with Apply nodes. Also drop SpaceBefore and SpaceAfter nodes.
pub fn desugar_expr<'a>( pub fn desugar_expr<'a>(