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

Evaluate function arguments in context before applying them

Browse Source
This commit is contained in:
greg 2018-05-13 17:32:41 -07:00
parent 8d6fea942f
commit afc4281e7f
1 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
schala-lang/src/eval.rs
View File

@ -417,6 +417,7 @@ impl<'a> State<'a> {
} }
let mut func_state = State { values: self.values.new_frame(name.map(|n| format!("{}", n))) }; let mut func_state = State { values: self.values.new_frame(name.map(|n| format!("{}", n))) };
for (param, val) in params.into_iter().zip(args.into_iter()) { for (param, val) in params.into_iter().zip(args.into_iter()) {
let val = func_state.expression(val)?;
func_state.values.insert(param, ValueEntry::Binding { constant: true, val }); func_state.values.insert(param, ValueEntry::Binding { constant: true, val });
} }
// TODO figure out function return semantics // TODO figure out function return semantics
@ -531,4 +532,9 @@ mod eval_tests {
fresh_env!("var a = 1; a = 2; a", "2"); fresh_env!("var a = 1; a = 2; a", "2");
fresh_env!(r#"("a", 1 + 2)"#, r#"("a", 3)"#); fresh_env!(r#"("a", 1 + 2)"#, r#"("a", 3)"#);
} }
fn function_eval() {
fresh_env!("fn oi(x) { x + 1 }; oi(4)", "5");
fresh_env!("fn oi(x) { x + 1 }; oi(1+2)", "4");
}
} }