This commit is contained in:
mlokr 2024-07-19 13:21:14 +02:00
parent 29d5774c47
commit 71359d82aa
No known key found for this signature in database
GPG key ID: DEA147DDEE644993

View file

@ -951,8 +951,8 @@ impl<'a> std::fmt::Display for Expr<'a> {
write!(f, "{}(", Postfix(func))?;
fmt_list(f, trailing_comma, ")", args, std::fmt::Display::fmt)
}
Self::Return { val: Some(val), .. } => write!(f, "return {val};"),
Self::Return { val: None, .. } => write!(f, "return;"),
Self::Return { val: Some(val), .. } => write!(f, "return {val}"),
Self::Return { val: None, .. } => write!(f, "return"),
Self::Ident { name, .. } => write!(f, "{name}"),
Self::Block { stmts, .. } => {
write!(f, "{{")?;
@ -963,7 +963,7 @@ impl<'a> std::fmt::Display for Expr<'a> {
for _ in 0..INDENT.with(|i| i.get()) {
write!(f, "\t")?;
}
writeln!(f, "{stmt}")?;
writeln!(f, "{stmt};")?;
}
Ok(())
})();
@ -989,15 +989,7 @@ impl<'a> std::fmt::Display for Expr<'a> {
display_branch(f, left)?;
write!(f, " {op} ")?;
display_branch(f, right)?;
if matches!(op, TokenKind::Decl | TokenKind::Assign)
&& !matches!(right, Self::Closure { .. })
{
write!(f, ";")?;
}
Ok(())
display_branch(f, right)
}
}
}