Reduce nesting of match expression

This commit is contained in:
yt2b 2022-11-27 23:43:26 +09:00
parent 27dd95c8f9
commit eee3c03042

View file

@ -1178,8 +1178,7 @@ impl SymbolTableBuilder {
let symbol = if let Some(symbol) = table.symbols.get_mut(name.as_ref()) { let symbol = if let Some(symbol) = table.symbols.get_mut(name.as_ref()) {
// Role already set.. // Role already set..
match role { match role {
SymbolUsage::Global => { SymbolUsage::Global if !symbol.is_global() => {
if !symbol.is_global() {
if symbol.is_parameter { if symbol.is_parameter {
return Err(SymbolTableError { return Err(SymbolTableError {
error: format!("name '{}' is parameter and global", name), error: format!("name '{}' is parameter and global", name),
@ -1188,10 +1187,7 @@ impl SymbolTableBuilder {
} }
if symbol.is_referenced { if symbol.is_referenced {
return Err(SymbolTableError { return Err(SymbolTableError {
error: format!( error: format!("name '{}' is used prior to global declaration", name),
"name '{}' is used prior to global declaration",
name
),
location, location,
}); });
} }
@ -1211,7 +1207,6 @@ impl SymbolTableBuilder {
}); });
} }
} }
}
SymbolUsage::Nonlocal => { SymbolUsage::Nonlocal => {
if symbol.is_parameter { if symbol.is_parameter {
return Err(SymbolTableError { return Err(SymbolTableError {