Skip to content

Commit

Permalink
Merge branch 'main' into fromutf-roc
Browse files Browse the repository at this point in the history
  • Loading branch information
@shua
shua committed Jan 21, 2025
2 parents 8146afc + 5b4c8e7 commit 063dfc3
Show file tree
Hide file tree
Showing 15 changed files with 273 additions and 70 deletions.
30 changes: 6 additions & 24 deletions crates/compiler/fmt/src/expr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -233,16 +233,9 @@ fn format_expr_only(
Expr::If {
if_thens: branches,
final_else,
indented_else,
indented_else: _,
} => {
fmt_if(
buf,
branches,
final_else,
item.is_multiline(),
*indented_else,
indent,
);
fmt_if(buf, branches, final_else, item.is_multiline(), indent);
}
Expr::When(loc_condition, branches) => fmt_when(buf, loc_condition, branches, indent),
Expr::Tuple(items) => fmt_expr_collection(buf, indent, Braces::Round, *items, Newlines::No),
Expand Down Expand Up @@ -1927,8 +1920,6 @@ fn fmt_if<'a>(
branches: &'a [(Loc<Expr<'a>>, Loc<Expr<'a>>)],
final_else: &'a Loc<Expr<'a>>,
is_multiline: bool,
indented_else: bool,

indent: u16,
) {
// let is_multiline_then = loc_then.is_multiline();
Expand Down Expand Up @@ -1972,29 +1963,20 @@ fn fmt_if<'a>(
}

buf.ensure_ends_with_whitespace();
if indented_else {
buf.indent(indent + INDENT);
buf.push_str("else");
buf.newline();
buf.newline();
} else if is_multiline {
buf.indent(indent);
buf.push_str("else");
buf.indent(indent);
buf.push_str("else");
if is_multiline {
buf.newline();
} else {
buf.indent(indent);
buf.push_str("else");
buf.spaces(1);
}
let indent = if indented_else { indent } else { return_indent };
final_else.format(buf, indent);
final_else.format(buf, return_indent);
}

fn fmt_closure<'a>(
buf: &mut Buf,
loc_patterns: &'a [Loc<Pattern<'a>>],
loc_ret: &'a Loc<Expr<'a>>,

indent: u16,
) {
use self::Expr::*;
Expand Down
41 changes: 21 additions & 20 deletions crates/compiler/parse/src/expr.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3390,7 +3390,7 @@ fn starts_with_spaces_conservative(value: &Pattern<'_>) -> bool {
}

fn type_header_equivalent_to_pat<'a>(header: &TypeHeader<'a>, pat: &Pattern<'a>) -> bool {
match pat {
match pat.without_spaces() {
Pattern::Apply(func, args) => {
if !matches!(func.value, Pattern::Tag(tag) if header.name.value == tag) {
return false;
Expand All @@ -3399,7 +3399,7 @@ fn type_header_equivalent_to_pat<'a>(header: &TypeHeader<'a>, pat: &Pattern<'a>)
return false;
}
for (arg, var) in (*args).iter().zip(header.vars) {
match (arg.value, var.value) {
match (arg.value.without_spaces(), var.value.without_spaces()) {
(Pattern::Identifier { ident: left }, TypeVar::Identifier(right)) => {
if left != right {
return false;
Expand All @@ -3410,7 +3410,7 @@ fn type_header_equivalent_to_pat<'a>(header: &TypeHeader<'a>, pat: &Pattern<'a>)
}
true
}
Pattern::Tag(tag) => header.vars.is_empty() && header.name.value == *tag,
Pattern::Tag(tag) => header.vars.is_empty() && header.name.value == tag,
_ => false,
}
}
Expand Down Expand Up @@ -3991,9 +3991,10 @@ enum OperatorOrDef {
}

fn bin_op<'a>(check_for_defs: bool) -> impl Parser<'a, BinOp, EExpr<'a>> {
(move |_, state: State<'a>, min_indent| {
(move |arena: &'a Bump, state: State<'a>, min_indent| {
let start = state.pos();
let (_, op, state) = operator_help(EExpr::Start, EExpr::BadOperator, state, min_indent)?;
let (_, op, state) =
operator_help(arena, EExpr::Start, EExpr::BadOperator, state, min_indent)?;
let err_progress = if check_for_defs {
MadeProgress
} else {
Expand All @@ -4014,12 +4015,15 @@ fn bin_op<'a>(check_for_defs: bool) -> impl Parser<'a, BinOp, EExpr<'a>> {
}

fn operator<'a>() -> impl Parser<'a, OperatorOrDef, EExpr<'a>> {
(move |_, state, min_indent| operator_help(EExpr::Start, EExpr::BadOperator, state, min_indent))
.trace("operator")
(move |arena: &'a Bump, state, min_indent| {
operator_help(arena, EExpr::Start, EExpr::BadOperator, state, min_indent)
})
.trace("operator")
}

#[inline(always)]
fn operator_help<'a, F, G, E>(
arena: &'a Bump,
to_expectation: F,
to_error: G,
mut state: State<'a>,
Expand All @@ -4030,20 +4034,17 @@ where
G: Fn(&'a str, Position) -> E,
E: 'a,
{
match *state.bytes() {
[b'o', b'r', ..] => {
return Ok((
MadeProgress,
OperatorOrDef::BinOp(BinOp::Or),
state.advance(2),
))
let and_or = either(
parser::keyword(keyword::AND, EExpr::End),
parser::keyword(keyword::OR, EExpr::End),
);

match and_or.parse(arena, state.clone(), min_indent) {
Ok((MadeProgress, Either::First(_), state)) => {
return Ok((MadeProgress, OperatorOrDef::BinOp(BinOp::And), state))
}
[b'a', b'n', b'd', ..] => {
return Ok((
MadeProgress,
OperatorOrDef::BinOp(BinOp::And),
state.advance(3),
))
Ok((MadeProgress, Either::Second(_), state)) => {
return Ok((MadeProgress, OperatorOrDef::BinOp(BinOp::Or), state))
}
_ => {}
}
Expand Down
4 changes: 2 additions & 2 deletions crates/compiler/parse/src/normalize.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -778,11 +778,11 @@ impl<'a> Normalize<'a> for Expr<'a> {
Expr::If {
if_thens,
final_else,
indented_else,
indented_else: _,
} => Expr::If {
if_thens: if_thens.normalize(arena),
final_else: arena.alloc(final_else.normalize(arena)),
indented_else,
indented_else: false,
},
Expr::When(a, b) => Expr::When(arena.alloc(a.normalize(arena)), b.normalize(arena)),
Expr::ParensAround(a) => {
Expand Down
5 changes: 5 additions & 0 deletions ...piler/test_syntax/tests/snapshots/pass/if_bang_then_bang_indented_else.expr.formatted.roc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if !a! then
t
else
l
5
72 changes: 72 additions & 0 deletions ...compiler/test_syntax/tests/snapshots/pass/if_bang_then_bang_indented_else.expr.result-ast
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
@1-24 SpaceAfter(
Defs(
Defs {
tags: [
EitherIndex(2147483648),
],
regions: [
@1-22,
],
space_before: [
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 0 },
],
space_after: [
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 0 },
],
spaces: [],
type_defs: [],
value_defs: [
Stmt(
@1-22 If {
if_thens: [
(
@3-6 UnaryOp(
@4-6 Var {
module_name: "",
ident: "a!",
},
@3-4 Not,
),
@11-12 SpaceBefore(
SpaceAfter(
Var {
module_name: "",
ident: "t",
},
[
Newline,
],
),
[
Newline,
],
),
),
],
final_else: @21-22 SpaceBefore(
Var {
module_name: "",
ident: "l",
},
[
Newline,
],
),
indented_else: true,
},
),
],
},
@23-24 SpaceBefore(
Num(
"5",
),
[
Newline,
],
),
),
[
Newline,
],
)
5 changes: 5 additions & 0 deletions crates/compiler/test_syntax/tests/snapshots/pass/if_bang_then_bang_indented_else.expr.roc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
if!a!then
t
else
l
5
7 changes: 3 additions & 4 deletions crates/compiler/test_syntax/tests/snapshots/pass/if_then_weird_indent.expr.formatted.roc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ if
k
then
A
else

e
r
else
e
r
3 changes: 3 additions & 0 deletions crates/compiler/test_syntax/tests/snapshots/pass/sep_annotation.expr.formatted.roc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
E : i
E = h
0
60 changes: 60 additions & 0 deletions crates/compiler/test_syntax/tests/snapshots/pass/sep_annotation.expr.result-ast
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
@0-11 SpaceAfter(
Defs(
Defs {
tags: [
EitherIndex(2147483648),
],
regions: [
@0-9,
],
space_before: [
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 0 },
],
space_after: [
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 0 },
],
spaces: [],
type_defs: [],
value_defs: [
AnnotatedBody {
ann_pattern: Apply(
@0-1 Tag(
"E",
),
[],
),
ann_type: @2-3 BoundVariable(
"i",
),
lines_between: [
Newline,
Newline,
],
body_pattern: @5-6 SpaceAfter(
Tag(
"E",
),
[
Newline,
],
),
body_expr: @8-9 Var {
module_name: "",
ident: "h",
},
},
],
},
@10-11 SpaceBefore(
Num(
"0",
),
[
Newline,
],
),
),
[
Newline,
],
)
5 changes: 5 additions & 0 deletions crates/compiler/test_syntax/tests/snapshots/pass/sep_annotation.expr.roc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
E:i

E
=h
0
3 changes: 3 additions & 0 deletions crates/compiler/test_syntax/tests/snapshots/pass/sneaky_and_expr.expr.formatted.roc
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
a
ands
d
55 changes: 55 additions & 0 deletions crates/compiler/test_syntax/tests/snapshots/pass/sneaky_and_expr.expr.result-ast
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
@0-11 SpaceAfter(
Defs(
Defs {
tags: [
EitherIndex(2147483648),
EitherIndex(2147483649),
],
regions: [
@0-1,
@2-9,
],
space_before: [
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 0 },
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 1 },
],
space_after: [
Slice<roc_parse::ast::CommentOrNewline> { start: 0, length: 0 },
Slice<roc_parse::ast::CommentOrNewline> { start: 1, length: 0 },
],
spaces: [
Newline,
],
type_defs: [],
value_defs: [
Stmt(
@0-1 Var {
module_name: "",
ident: "a",
},
),
Body(
@2-4 RecordDestructure(
[],
),
@5-9 Var {
module_name: "",
ident: "ands",
},
),
],
},
@10-11 SpaceBefore(
Var {
module_name: "",
ident: "d",
},
[
Newline,
],
),
),
[
Newline,
],
)
Loading

0 comments on commit 063dfc3

Please sign in to comment.