Skip to content

Fix indent and is_last variable misusage #9

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Meredith2328 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Fix indent and is_last variable misusage #9

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/ast/tree.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ impl DisplayAsTree for Program {
writeln!(f, "{}Program", tree_indent(indent_levels, is_last))?;
// Build the indentation context for children.
let mut new_indent = indent_levels.to_vec();
new_indent.push(!is_last);
new_indent.push(is_last);
let last_index = self.elements.len().saturating_sub(1);
for (i, elem) in self.elements.iter().enumerate() {
elem.fmt_tree(f, &new_indent, i == last_index)?;
Expand Down Expand Up @@ -115,7 +115,9 @@ impl DisplayAsTree for VarDeclStmt {
) -> Result<(), Error> {
writeln!(f, "{}VarDeclStmt", tree_indent(indent_levels, is_last))?;
// The inner node is always the single (last) child.
self.inner.fmt_tree(f, indent_levels, true)
let mut new_indent = indent_levels.to_vec();
new_indent.push(is_last);
self.inner.fmt_tree(f, &new_indent, true)
}
}

Expand Down Expand Up @@ -207,7 +209,7 @@ impl DisplayAsTree for FnDecl {
if let Some(params) = &self.param_decl {
// Extend the indentation context for the parameter subtree.
let mut new_indent = indent_levels.to_vec();
new_indent.push(!is_last);
new_indent.push(is_last);
writeln!(f, "{}Params:", tree_indent(&new_indent, false))?;
params.decls.fmt_tree(f, &new_indent, true)?;
}
Expand Down Expand Up @@ -242,7 +244,7 @@ impl DisplayAsTree for FnDef {
self.fn_decl.identifier
)?;
let mut new_indent = indent_levels.to_vec();
new_indent.push(!is_last);
new_indent.push(is_last);
self.stmts.fmt_tree(f, &new_indent, true)
}
}
Expand Down