language-servers/roc
1
0
Fork 0
mirror of https://github.com/roc-lang/roc.git synced 2025-09-29 14:54:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Fix zero-length dbg arg list

Browse source
This commit is contained in:
Joshua Warner 2025-01-09 20:25:20 -08:00
parent 8deca25c5e
commit 7acf9c5e5d
No known key found for this signature in database
GPG key ID: 89AD497003F93FDD
7 changed files with 141 additions and 79 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -822,19 +822,23 @@ fn fold_defs<'a>(
),
..
}) => {
let rest = fold_defs(arena, defs, final_expr);
let new_final = Expr::DbgStmt {
first: args[0],
extra_args: &args[1..],
continuation: arena.alloc(Loc::at_zero(rest)),
};
if new_defs.is_empty() {
return new_final;
if let Some((first, extra_args)) = args.split_first() {
let rest = fold_defs(arena, defs, final_expr);
let new_final = Expr::DbgStmt {
first,
extra_args,
continuation: arena.alloc(Loc::at_zero(rest)),
};
if new_defs.is_empty() {
return new_final;
}
return Expr::Defs(
arena.alloc(new_defs),
arena.alloc(Loc::at_zero(new_final)),
);
} else {
new_defs.push_value_def(vd, Region::zero(), &[], &[]);
}
return Expr::Defs(
arena.alloc(new_defs),
arena.alloc(Loc::at_zero(new_final)),
);
}
ValueDef::Stmt(&Loc {
value:
@ -846,19 +850,23 @@ fn fold_defs<'a>(
),
..
}) => {
let rest = fold_defs(arena, defs, final_expr);
let new_final = Expr::DbgStmt {
first: args.items[0],
extra_args: &args.items[1..],
continuation: arena.alloc(Loc::at_zero(rest)),
};
if new_defs.is_empty() {
return new_final;
if let Some((first, extra_args)) = args.items.split_first() {
let rest = fold_defs(arena, defs, final_expr);
let new_final = Expr::DbgStmt {
first,
extra_args,
continuation: arena.alloc(Loc::at_zero(rest)),
};
if new_defs.is_empty() {
return new_final;
}
return Expr::Defs(
arena.alloc(new_defs),
arena.alloc(Loc::at_zero(new_final)),
);
} else {
new_defs.push_value_def(vd, Region::zero(), &[], &[]);
}
return Expr::Defs(
arena.alloc(new_defs),
arena.alloc(Loc::at_zero(new_final)),
);
}
_ => {
new_defs.push_value_def(vd, Region::zero(), &[], &[]);