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

Refactor parse_location

Browse Source
This commit is contained in:
pjht 2022-10-17 16:17:09 -05:00
parent c6b152a6cf
commit 4caa5d2fdc
1 changed files with 12 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/main.rs
View File

@ -640,28 +640,23 @@ fn parse_location(
symbol_tables: &HashMap<String, HashMap<String, Symbol>>,
) -> Result<Location, Error> {
parse::<u32>(location).map(Location::Address).or_else(|_| {
let (table_name, symbol_name) = location.split_once(':').unwrap_or(("", location));
let (mut table_name, symbol_name) = location.split_once(':').unwrap_or(("", location));
if table_name.is_empty() {
for (curr_table_name, table) in symbol_tables.iter() {
if table.contains_key(symbol_name) {
return Ok(Location::Symbol((
curr_table_name.to_string(),
symbol_name.to_string(),
)));
}
}
Err(Error::InvalidSymbolName)
} else if symbol_tables
table_name = symbol_tables
.iter()
.find(|(_, table)| table.contains_key(symbol_name))
.ok_or(Error::InvalidSymbolName)?
.0;
} else if !symbol_tables
.get(table_name)
.ok_or(Error::InvalidSymbolTable)?
.contains_key(symbol_name)
{
Ok(Location::Symbol((
table_name.to_string(),
symbol_name.to_string(),
)))
} else {
Err(Error::InvalidSymbolName)
return Err(Error::InvalidSymbolName);
}
Ok(Location::Symbol((
table_name.to_string(),
symbol_name.to_string(),
)))
})
}