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

Merge pull request #7245 from joshuawarner32/dbg-expr-only

Browse source 
Make dbg always be parsed as an expression
This commit is contained in:
Joshua Warner 2024-11-26 17:41:28 -08:00 • committed by GitHub
commit 0295bb58da
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
14 changed files with 122 additions and 156 deletions
Download patch file Download diff file Expand all files Collapse all files

46
crates/compiler/can/tests/snapshots/test_suffixed__suffixed_tests__dbg_expr.snap
View file

@ -7,7 +7,7 @@ Defs {
EitherIndex(2147483648), EitherIndex(2147483648),
], ],
regions: [ regions: [
@0-26, @0-28,
], ],
space_before: [ space_before: [
Slice { start: 0, length: 0 }, Slice { start: 0, length: 0 },
@ -24,13 +24,13 @@ Defs {
@0-4 Identifier { @0-4 Identifier {
ident: "main", ident: "main",
}, },
@11-26 Defs( @11-28 Defs(
Defs { Defs {
tags: [ tags: [
EitherIndex(2147483648), EitherIndex(2147483648),
], ],
regions: [ regions: [
@15-26, @16-27,
], ],
space_before: [ space_before: [
Slice { start: 0, length: 0 }, Slice { start: 0, length: 0 },
@ -42,17 +42,17 @@ Defs {
type_defs: [], type_defs: [],
value_defs: [ value_defs: [
Body( Body(
@15-26 Identifier { @16-27 Identifier {
ident: "1", ident: "1",
}, },
@15-26 ParensAround( @16-27 ParensAround(
Defs( Defs(
Defs { Defs {
tags: [ tags: [
EitherIndex(2147483648), EitherIndex(2147483648),
], ],
regions: [ regions: [
@20-25, @21-26,
], ],
space_before: [ space_before: [
Slice { start: 0, length: 0 }, Slice { start: 0, length: 0 },
@ -64,19 +64,20 @@ Defs {
type_defs: [], type_defs: [],
value_defs: [ value_defs: [
Body( Body(
@20-25 Identifier { @21-26 Identifier {
ident: "0", ident: "0",
}, },
@20-25 Apply( @21-26 ParensAround(
@22-23 Var { Apply(
@23-24 Var {
module_name: "Num", module_name: "Num",
ident: "add", ident: "add",
}, },
[ [
@20-21 Num( @21-22 Num(
"1", "1",
), ),
@24-25 Num( @25-26 Num(
"1", "1",
), ),
], ],
@ -85,27 +86,28 @@ Defs {
), ),
), ),
), ),
),
], ],
}, },
@15-26 LowLevelDbg( @16-27 LowLevelDbg(
( (
"test.roc:3", "test.roc:3",
" ", " ",
), ),
@20-25 Apply( @21-26 Apply(
@20-25 Var { @21-26 Var {
module_name: "Inspect", module_name: "Inspect",
ident: "toStr", ident: "toStr",
}, },
[ [
@20-25 Var { @21-26 Var {
module_name: "", module_name: "",
ident: "0", ident: "0",
}, },
], ],
Space, Space,
), ),
@20-25 Var { @21-26 Var {
module_name: "", module_name: "",
ident: "0", ident: "0",
}, },
@ -115,25 +117,25 @@ Defs {
), ),
], ],
}, },
@11-26 LowLevelDbg( @11-28 LowLevelDbg(
( (
"test.roc:2", "test.roc:2",
"in =\n ", "n =\n ",
), ),
@15-26 Apply( @16-27 Apply(
@15-26 Var { @16-27 Var {
module_name: "Inspect", module_name: "Inspect",
ident: "toStr", ident: "toStr",
}, },
[ [
@15-26 Var { @16-27 Var {
module_name: "", module_name: "",
ident: "1", ident: "1",
}, },
], ],
Space, Space,
), ),
@15-26 Var { @16-27 Var {
module_name: "", module_name: "",
ident: "1", ident: "1",
}, },

2
crates/compiler/can/tests/test_suffixed.rs
View file

@ -464,7 +464,7 @@ mod suffixed_tests {
run_test!( run_test!(
r#" r#"
main = main =
dbg (dbg 1 + 1) dbg (dbg (1 + 1))
"# "#
); );
} }

43
crates/compiler/fmt/src/expr.rs
View file

@ -447,7 +447,7 @@ impl<'a> Formattable for Expr<'a> {
buf.push_str("dbg"); buf.push_str("dbg");
} }
DbgStmt(condition, continuation) => { DbgStmt(condition, continuation) => {
fmt_dbg_stmt(buf, condition, continuation, self.is_multiline(), indent); fmt_dbg_stmt(buf, condition, continuation, parens, indent);
} }
LowLevelDbg(_, _, _) => unreachable!( LowLevelDbg(_, _, _) => unreachable!(
"LowLevelDbg should only exist after desugaring, not during formatting" "LowLevelDbg should only exist after desugaring, not during formatting"
@ -1022,42 +1022,15 @@ fn fmt_dbg_stmt<'a>(
buf: &mut Buf, buf: &mut Buf,
condition: &'a Loc<Expr<'a>>, condition: &'a Loc<Expr<'a>>,
continuation: &'a Loc<Expr<'a>>, continuation: &'a Loc<Expr<'a>>,
_: bool, parens: Parens,
indent: u16, indent: u16,
) { ) {
buf.ensure_ends_with_newline(); Expr::Apply(
buf.indent(indent); &Loc::at_zero(Expr::Dbg),
buf.push_str("dbg"); &[condition],
called_via::CalledVia::Space,
buf.spaces(1); )
.format_with_options(buf, parens, Newlines::Yes, indent);
fn should_outdent(mut expr: &Expr) -> bool {
loop {
match expr {
Expr::ParensAround(_) | Expr::List(_) | Expr::Record(_) | Expr::Tuple(_) => {
return true
}
Expr::SpaceAfter(inner, _) => {
expr = inner;
}
_ => return false,
}
}
}
let inner_indent = if should_outdent(&condition.value) {
indent
} else {
indent + INDENT
};
let cond_value = condition.value.extract_spaces();
let is_defs = matches!(cond_value.item, Expr::Defs(_, _));
let newlines = if is_defs { Newlines::Yes } else { Newlines::No };
condition.format_with_options(buf, Parens::NotNeeded, newlines, inner_indent);
// Always put a blank line after the `dbg` line(s) // Always put a blank line after the `dbg` line(s)
buf.ensure_ends_with_blank_line(); buf.ensure_ends_with_blank_line();

63
crates/compiler/parse/src/expr.rs
View file

@ -545,10 +545,6 @@ fn stmt_start<'a>(
EExpr::Expect, EExpr::Expect,
expect_help(options, preceding_comment) expect_help(options, preceding_comment)
)), )),
loc(specialize_err(
EExpr::Dbg,
dbg_stmt_help(options, preceding_comment)
)),
loc(specialize_err(EExpr::Return, return_help(options))), loc(specialize_err(EExpr::Return, return_help(options))),
loc(specialize_err(EExpr::Import, map(import(), Stmt::ValueDef))), loc(specialize_err(EExpr::Import, map(import(), Stmt::ValueDef))),
map( map(
@ -2668,34 +2664,6 @@ fn return_help<'a>(options: ExprParseOptions) -> impl Parser<'a, Stmt<'a>, ERetu
.trace("return_help") .trace("return_help")
} }
fn dbg_stmt_help<'a>(
options: ExprParseOptions,
preceding_comment: Region,
) -> impl Parser<'a, Stmt<'a>, EExpect<'a>> {
(move |arena: &'a Bump, state: State<'a>, min_indent| {
let (_, _, state) =
parser::keyword(keyword::DBG, EExpect::Dbg).parse(arena, state, min_indent)?;
let (_, condition, state) = parse_block(
options,
arena,
state,
true,
EExpect::IndentCondition,
EExpect::Condition,
)
.map_err(|(_, f)| (MadeProgress, f))?;
let stmt = Stmt::ValueDef(ValueDef::Dbg {
condition: arena.alloc(condition),
preceding_comment,
});
Ok((MadeProgress, stmt, state))
})
.trace("dbg_stmt_help")
}
fn dbg_kw<'a>() -> impl Parser<'a, Expr<'a>, EExpect<'a>> { fn dbg_kw<'a>() -> impl Parser<'a, Expr<'a>, EExpect<'a>> {
(move |arena: &'a Bump, state: State<'a>, min_indent: u32| { (move |arena: &'a Bump, state: State<'a>, min_indent: u32| {
let (_, _, next_state) = let (_, _, next_state) =
@ -3110,12 +3078,43 @@ fn stmts_to_defs<'a>(
} }
Stmt::Expr(e) => { Stmt::Expr(e) => {
if i + 1 < stmts.len() { if i + 1 < stmts.len() {
if let Expr::Apply(
Loc {
value: Expr::Dbg, ..
},
args,
_,
) = e
{
if args.len() != 1 {
// TODO: this should be done in can, not parsing!
return Err(EExpr::Dbg(
EExpect::DbgArity(sp_stmt.item.region.start()),
sp_stmt.item.region.start(),
));
}
let condition = &args[0];
let rest = stmts_to_expr(&stmts[i + 1..], arena)?;
let e = Expr::DbgStmt(condition, arena.alloc(rest));
let e = if sp_stmt.before.is_empty() {
e
} else {
arena.alloc(e).before(sp_stmt.before)
};
last_expr = Some(Loc::at(sp_stmt.item.region, e));
// don't re-process the rest of the statements; they got consumed by the dbg expr
break;
} else {
defs.push_value_def( defs.push_value_def(
ValueDef::Stmt(arena.alloc(Loc::at(sp_stmt.item.region, e))), ValueDef::Stmt(arena.alloc(Loc::at(sp_stmt.item.region, e))),
sp_stmt.item.region, sp_stmt.item.region,
sp_stmt.before, sp_stmt.before,
&[], &[],
); );
}
} else { } else {
let e = if sp_stmt.before.is_empty() { let e = if sp_stmt.before.is_empty() {
e e

1
crates/compiler/parse/src/normalize.rs
View file

@ -1465,6 +1465,7 @@ impl<'a> Normalize<'a> for EExpect<'a> {
EExpect::Continuation(arena.alloc(inner_err.normalize(arena)), Position::zero()) EExpect::Continuation(arena.alloc(inner_err.normalize(arena)), Position::zero())
} }
EExpect::IndentCondition(_) => EExpect::IndentCondition(Position::zero()), EExpect::IndentCondition(_) => EExpect::IndentCondition(Position::zero()),
EExpect::DbgArity(_) => EExpect::DbgArity(Position::zero()),
} }
} }
} }

1
crates/compiler/parse/src/parser.rs
View file

@ -513,6 +513,7 @@ pub enum EExpect<'a> {
Condition(&'a EExpr<'a>, Position), Condition(&'a EExpr<'a>, Position),
Continuation(&'a EExpr<'a>, Position), Continuation(&'a EExpr<'a>, Position),
IndentCondition(Position), IndentCondition(Position),
DbgArity(Position),
} }
#[derive(Debug, Clone, PartialEq, Eq)] #[derive(Debug, Clone, PartialEq, Eq)]

2
crates/compiler/test_syntax/tests/snapshots/pass/dbg.expr.result-ast
View file

@ -1,6 +1,6 @@
SpaceAfter( SpaceAfter(
Apply( Apply(
@0-5 Dbg, @0-3 Dbg,
[ [
@4-5 Num( @4-5 Num(
"1", "1",

2
crates/compiler/test_syntax/tests/snapshots/pass/dbg_stmt.expr.formatted.roc
View file

@ -1,3 +1,3 @@
dbg 1 == 1 dbg (1 == 1)
4 4

12
crates/compiler/test_syntax/tests/snapshots/pass/dbg_stmt.expr.result-ast
View file

@ -1,20 +1,22 @@
SpaceBefore( SpaceBefore(
SpaceAfter( SpaceAfter(
DbgStmt( DbgStmt(
@5-11 BinOps( @6-12 ParensAround(
BinOps(
[ [
( (
@5-6 Num( @6-7 Num(
"1", "1",
), ),
@7-9 Equals, @8-10 Equals,
), ),
], ],
@10-11 Num( @11-12 Num(
"1", "1",
), ),
), ),
@13-14 SpaceBefore( ),
@15-16 SpaceBefore(
Num( Num(
"4", "4",
), ),

2
crates/compiler/test_syntax/tests/snapshots/pass/dbg_stmt.expr.roc
View file

@ -1,4 +1,4 @@
dbg 1 == 1 dbg (1 == 1)
4 4

2
crates/compiler/test_syntax/tests/snapshots/pass/dbg_stmt_two_exprs.expr.formatted.roc
View file

@ -1,6 +1,8 @@
dbg dbg
(
q q
qt qt
)
g g
qt qt

39
crates/compiler/test_syntax/tests/snapshots/pass/dbg_stmt_two_exprs.expr.result-ast
View file

@ -1,32 +1,14 @@
SpaceAfter( SpaceAfter(
DbgStmt( DbgStmt(
@5-10 SpaceBefore( @6-14 SpaceBefore(
Defs( ParensAround(
Defs { Apply(
tags: [ @6-7 Var {
EitherIndex(2147483648),
],
regions: [
@5-6,
],
space_before: [
Slice { start: 0, length: 0 },
],
space_after: [
Slice { start: 0, length: 0 },
],
spaces: [],
type_defs: [],
value_defs: [
Stmt(
@5-6 Var {
module_name: "", module_name: "",
ident: "q", ident: "q",
}, },
), [
], @12-14 SpaceBefore(
},
@8-10 SpaceBefore(
Var { Var {
module_name: "", module_name: "",
ident: "qt", ident: "qt",
@ -35,19 +17,22 @@ SpaceAfter(
Newline, Newline,
], ],
), ),
],
Space,
),
), ),
[ [
Newline, Newline,
], ],
), ),
@11-16 SpaceBefore( @16-21 SpaceBefore(
Apply( Apply(
@11-12 Var { @16-17 Var {
module_name: "", module_name: "",
ident: "g", ident: "g",
}, },
[ [
@14-16 SpaceBefore( @19-21 SpaceBefore(
Var { Var {
module_name: "", module_name: "",
ident: "qt", ident: "qt",

4
crates/compiler/test_syntax/tests/snapshots/pass/dbg_stmt_two_exprs.expr.roc
View file

@ -1,5 +1,5 @@
dbg dbg
q (q
qt qt)
g g
qt qt

1
crates/reporting/src/error/parse.rs
View file

@ -1512,6 +1512,7 @@ fn to_dbg_or_expect_report<'a>(
to_space_report(alloc, lines, filename, err, *pos) to_space_report(alloc, lines, filename, err, *pos)
} }
roc_parse::parser::EExpect::DbgArity(_) => todo!(),
roc_parse::parser::EExpect::Dbg(_) => unreachable!("another branch would be taken"), roc_parse::parser::EExpect::Dbg(_) => unreachable!("another branch would be taken"),
roc_parse::parser::EExpect::Expect(_) => unreachable!("another branch would be taken"), roc_parse::parser::EExpect::Expect(_) => unreachable!("another branch would be taken"),