alex/gb-emu
1
0
Fork 0
Code Pull requests Releases Packages Activity Actions

better debug command parsing

Browse source
This commit is contained in:
Alex Janka 2023-05-18 11:01:26 +10:00
parent 74dc5ccfb4
commit 48e794861b
1 changed files with 7 additions and 6 deletions

13
gb-emu/src/debug.rs
View file

@ -22,19 +22,20 @@ impl FromStr for Commands {
type Err = CommandErr; type Err = CommandErr;
fn from_str(s: &str) -> Result<Self, Self::Err> { fn from_str(s: &str) -> Result<Self, Self::Err> {
let lower = s.trim().to_lowercase(); let trimmed = s.trim().to_lowercase();
let words: Vec<&str> = trimmed.split_whitespace().collect();
match lower.as_str() { match words.as_slice() {
"step" => Ok(Self::Step), ["step"] => Ok(Self::Step),
"continue" => Ok(Self::Continue), ["continue"] => Ok(Self::Continue),
_ if let Some(addr) = lower.strip_prefix("watch") => { ["watch", addr] => {
if let Ok(addr) = u16::from_str_radix(addr.trim().trim_start_matches("0x"), 16) { if let Ok(addr) = u16::from_str_radix(addr.trim().trim_start_matches("0x"), 16) {
Ok(Self::Watch(addr)) Ok(Self::Watch(addr))
} else { } else {
Err(CommandErr::InvalidArgument) Err(CommandErr::InvalidArgument)
} }
} }
_ if let Some(addr) = lower.strip_prefix("break") => { ["break", addr] => {
if let Ok(addr) = u16::from_str_radix(addr.trim().trim_start_matches("0x"), 16) { if let Ok(addr) = u16::from_str_radix(addr.trim().trim_start_matches("0x"), 16) {
Ok(Self::Break(addr)) Ok(Self::Break(addr))
} else { } else {