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

cleanup

Browse source
This commit is contained in:
Folkert 2021-02-03 23:33:13 +01:00
parent 59f547b2be
commit 7a02bcda8d
2 changed files with 5 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

21
compiler/parse/src/expr.rs
View file

@ -207,15 +207,7 @@ fn parse_expr<'a>(min_indent: u16, arena: &'a Bump, state: State<'a>) -> ParseRe
// parse the spaces and then attach them retroactively to the expression
// preceding the operator (the one we parsed before considering operators).
optional(and!(
// and!(space0(min_indent), loc!(binop())),
move |arena, state| {
let (_, spaces, state) = space0(min_indent).parse(arena, state)?;
let (_, op, state) = loc!(binop()).parse(arena, state)?;
Ok((MadeProgress, (spaces, op), state))
// and!(space0(min_indent), )).parse(arena, state)
},
and!(space0(min_indent), loc!(binop())),
// The spaces *after* the operator can be attached directly to
// the expression following the operator.
space0_before(
@ -593,13 +585,10 @@ fn body<'a>(min_indent: u16) -> impl Parser<'a, Body<'a>> {
equals_for_def(),
// Spaces after the '=' (at a normal indentation level) and then the expr.
// The expr itself must be indented more than the pattern and '='
move |a, s| {
space0_before(
loc!(move |arena, state| { parse_expr(indented_more, arena, state) }),
min_indent,
)
.parse(a, s)
}
space0_before(
loc!(move |arena, state| { parse_expr(indented_more, arena, state) }),
min_indent,
)
)
)
}