language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-10-02 16:21:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Fix Nested BinOp bug in Infixes

Browse source
This commit is contained in:
Richard Feldman 2019-12-01 21:25:13 -05:00
parent f069bf252c
commit 61825d5dab
1 changed files with 3 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/can/operator.rs
View file

@ -104,14 +104,7 @@ pub fn desugar<'a>(arena: &'a Bump, loc_expr: &'a Located<Expr<'a>>) -> &'a Loca
value: Closure(loc_patterns, desugar(arena, loc_ret)), value: Closure(loc_patterns, desugar(arena, loc_ret)),
}) })
} }
BinOp(_) => desugar_bin_op(arena, loc_expr), BinOp(_) | Nested(BinOp(_)) => desugar_bin_op(arena, loc_expr),
Nested(BinOp(op)) => desugar_bin_op(
arena,
arena.alloc(Located {
value: BinOp(op),
region: loc_expr.region,
}),
),
Defs(defs, loc_ret) | Nested(Defs(defs, loc_ret)) => { Defs(defs, loc_ret) | Nested(Defs(defs, loc_ret)) => {
let mut desugared_defs = Vec::with_capacity_in(defs.len(), arena); let mut desugared_defs = Vec::with_capacity_in(defs.len(), arena);
@ -621,7 +614,8 @@ impl<'a> Iterator for Infixes<'a> {
.remaining_expr .remaining_expr
.take() .take()
.map(|loc_expr| match loc_expr.value { .map(|loc_expr| match loc_expr.value {
Expr::BinOp((left, loc_op, right)) => { Expr::BinOp((left, loc_op, right))
| Expr::Nested(Expr::BinOp((left, loc_op, right))) => {
self.remaining_expr = Some(right); self.remaining_expr = Some(right);
self.next_op = Some(loc_op.clone()); self.next_op = Some(loc_op.clone());