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

DEV: Refactor get_binding to simplify the logic.

Browse Source
This commit is contained in:
Jeremy Wall 2020-02-01 10:25:55 -06:00
parent c1414bdde4
commit f866275df2
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/build/opcode/vm.rs
View File

@ -1080,14 +1080,13 @@ impl VM {
name: &str,
pos: &Position,
) -> Result<(Rc<Value>, Position), Error> {
if name == "self" {
if let Some((val, pos)) = self.self_stack.last() {
return Ok((val.clone(), pos.clone()));
}
return Err(Error::new(format!("No such binding {}", name), pos.clone()));
}
match self.symbols.get(name) {
Some((ref v, ref pos)) => Ok((v.clone(), pos.clone())),
let tpl = if name == "self" {
self.self_stack.last().cloned()
} else {
self.symbols.get(name)
};
match tpl {
Some((v, pos)) => Ok((v, pos)),
None => {
return Err(Error::new(format!("No such binding {}", name), pos.clone()));
}