m68k-backplane-computer/emu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rework symbol and breakpoint displaying

Browse Source
This commit is contained in:
pjht 2022-10-21 08:13:34 -05:00
parent 943ac2b593
commit 4134a302a9
2 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/main.rs
View File

@ -511,11 +511,8 @@ fn main() -> Result<(), ReplError> {
out += "\n";
}
out += "Address breakpoints:\n";
for breakpoint in &state.address_breakpoints {
out += &format!("{}\n", breakpoint);
}
out += &format!("{}", state.address_breakpoints.iter().format("\n"));
}
out.pop();
if out.is_empty() {
Ok(Some("No breakpoints".to_string()))
} else {

66
src/symbol_tables.rs
View File

@ -2,27 +2,28 @@ use std::{fmt::Display, path::Path};
use crate::{error::Error, location::Location, symbol::Symbol, symbol_table::SymbolTable};
use indexmap::IndexMap;
use itertools::Itertools;
use parse_int::parse;
pub struct SymbolDisplayer<'a>(&'a SymbolTables);
impl Display for SymbolDisplayer<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut first_table = true;
for (table_name, table) in self.0.tables.iter() {
if !first_table {
f.write_str("\n")?;
}
f.write_fmt(format_args!(
"{table_name} ({}):",
if table.active { "active" } else { "inactive" }
))?;
for (name, symbol) in table.symbols.iter() {
f.write_fmt(format_args!("\n{name}: {symbol}"))?;
}
first_table = false;
}
Ok(())
f.write_fmt(format_args!(
"{}",
self.0
.tables
.iter()
.format_with("\n", |(table_name, table), f| {
f(&format_args!(
"{table_name} ({}):\n{}",
if table.active { "active" } else { "inactive" },
table.symbols.iter().format_with("\n", |(name, symbol), g| {
g(&format_args!("{name}: {symbol}"))
}),
))
})
))
}
}
@ -30,24 +31,23 @@ pub struct BreakpointDisplayer<'a>(&'a SymbolTables);
impl Display for BreakpointDisplayer<'_> {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
let mut first_table = true;
for (table_name, table) in self.0.tables.iter() {
if !first_table {
f.write_str("\n")?;
}
if table.breakpoints.is_empty() {
continue;
}
f.write_fmt(format_args!(
"{table_name} ({}):",
if table.active { "active" } else { "inactive" }
))?;
for breakpoint in &table.breakpoints {
f.write_fmt(format_args!("\n{breakpoint}"))?;
}
first_table = false;
}
Ok(())
f.write_fmt(format_args!(
"{}",
self.0
.tables
.iter()
.format_with("\n", |(table_name, table), f| {
if !table.breakpoints.is_empty() {
f(&format_args!(
"{table_name} ({}):\n{}",
if table.active { "active" } else { "inactive" },
table.breakpoints.iter().format("\n")
))
} else {
Ok(())
}
})
))
}
}