greg
/
schala
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Move lookup_function back onto Evaluator 

THe problem was that we were borrowing the output of the inner HashMap,
if we clone it we don't borrow anything
This commit is contained in:
greg 2016-01-24 12:14:03 -08:00
parent 1ffbeb6472
commit dcf89aa429
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.rs
View File

@ -21,10 +21,6 @@ impl Funcmap {
let map = HashMap::new();
Funcmap { map: map }
}
fn lookup_function(&self, name: String) -> Option<Function> {
self.map.get(&name).map(|x| x.clone())
}
}
pub struct Evaluator {
@ -70,6 +66,9 @@ impl Evaluator {
self.funcmap.map.insert(name, function);
}
fn lookup_function(&self, name: String) -> Option<Function> {
self.funcmap.map.get(&name).map(|x| x.clone())
}
}
trait Evaluable {
@ -209,8 +208,7 @@ impl Evaluator {
fn reduce_call(&mut self, name: String, arguments: Vec<Expression>) -> Expression {
use parser::Expression::*;
let x = self.funcmap.lookup_function(name);
let function = match x {
let function = match self.lookup_function(name) {
Some(func) => func,
None => return Null
};