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

Variable binding in fucntion call work

Browse Source
This commit is contained in:
greg 2016-01-24 15:48:56 -08:00
parent dcf89aa429
commit 5eba222679
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/eval.rs
View File

@ -45,7 +45,10 @@ impl Evaluator {
} }
fn add_binding(&mut self, var: String, value: Expression) { fn add_binding(&mut self, var: String, value: Expression) {
self.varmap.map.insert(var, value); match self.frames.last_mut() {
Some(frame) => frame.map.insert(var, value),
None => self.varmap.map.insert(var, value),
};
} }
fn lookup_binding(&mut self, var: String) -> Option<Expression> { fn lookup_binding(&mut self, var: String) -> Option<Expression> {
@ -225,7 +228,10 @@ impl Evaluator {
self.frames.push(frame); self.frames.push(frame);
let mut retval = Null; let mut retval = Null;
for expr in function.body.iter() { for expr in function.body.iter() {
retval = self.reduce_expr(expr.clone()); retval = expr.clone();
while retval.is_reducible() {
retval = self.reduce_expr(retval);
}
} }
self.frames.pop(); self.frames.pop();