zaphar/ucg
1
0
Fork 0
mirror of https://github.com/zaphar/ucg.git synced 2025-07-22 18:19:54 -04:00
Code Issues Packages Projects Releases Wiki Activity

REFACTOR: Improve the typesafety of lookup_sym.

Browse Source 
It's easier to ensure you don't forget a case if you have to enumerate
them all. So don't use the catch all in this match.
This commit is contained in:
Jeremy Wall 2019-01-31 16:42:49 -06:00
parent 46ba32f038
commit 6a476d19dc
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/build/scope.rs
View File

@ -134,20 +134,20 @@ impl Scope {
} }
if self.search_curr_val && self.curr_val.is_some() { if self.search_curr_val && self.curr_val.is_some() {
match self.curr_val.as_ref().unwrap().as_ref() { match self.curr_val.as_ref().unwrap().as_ref() {
&Val::Env(ref fs) => { Val::Env(ref fs) => {
for (name, val) in fs.iter() { for (name, val) in fs.iter() {
if name == &sym.val { if name == &sym.val {
return Some(Rc::new(Val::Str(val.clone()))); return Some(Rc::new(Val::Str(val.clone())));
} }
} }
} }
&Val::Tuple(ref fs) => match Self::lookup_in_tuple(&sym.pos, &sym.val, fs) { Val::Tuple(ref fs) => match Self::lookup_in_tuple(&sym.pos, &sym.val, fs) {
Ok(v) => return Some(v), Ok(v) => return Some(v),
Err(_) => { Err(_) => {
// noop // noop
} }
}, },
&Val::List(ref fs) => { Val::List(ref fs) => {
match Self::lookup_in_list(&sym.pos, &Val::Str(sym.val.clone()), fs) { match Self::lookup_in_list(&sym.pos, &Val::Str(sym.val.clone()), fs) {
Ok(v) => return Some(v), Ok(v) => return Some(v),
Err(_) => { Err(_) => {
@ -155,7 +155,13 @@ impl Scope {
} }
} }
} }
_ => { Val::Boolean(_)
| Val::Empty
| Val::Float(_)
| Val::Int(_)
| Val::Module(_)
| Val::Str(_)
| Val::Func(_) => {
// noop // noop
} }
}; };