summaryrefslogtreecommitdiff
path: root/src/eval/mod.rs
diff options
context:
space:
mode:
authorLaurenz <laurmaedje@gmail.com>2021-08-16 18:14:58 +0200
committerLaurenz <laurmaedje@gmail.com>2021-08-16 18:14:58 +0200
commitcb0aab3cfab2122a87d1d221290f7178b4291758 (patch)
tree65c1562be490d4cb87c6419e8c773e00de401f65 /src/eval/mod.rs
parentba6b91e2ee9dfa729d21879f27773de7c7731cfe (diff)
Change how functions are called
Diffstat (limited to 'src/eval/mod.rs')
-rw-r--r--src/eval/mod.rs8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/eval/mod.rs b/src/eval/mod.rs
index f2afbafb..a03c83b6 100644
--- a/src/eval/mod.rs
+++ b/src/eval/mod.rs
@@ -377,7 +377,7 @@ impl Eval for CallExpr {
Value::Func(func) => {
let point = || Tracepoint::Call(func.name().map(Into::into));
- let value = func(ctx, &mut args).trace(point, self.span)?;
+ let value = func.call(ctx, &mut args).trace(point, self.span)?;
args.finish()?;
Ok(value)
}
@@ -520,13 +520,13 @@ impl Eval for WithExpr {
type Output = Value;
fn eval(&self, ctx: &mut EvalContext) -> TypResult<Self::Output> {
- let callee = self.callee.eval(ctx)?.cast::<Function>().at(self.callee.span())?;
+ let wrapped = self.callee.eval(ctx)?.cast::<Function>().at(self.callee.span())?;
let applied = self.args.eval(ctx)?;
- let name = callee.name().cloned();
+ let name = wrapped.name().cloned();
let func = Function::new(name, move |ctx, args| {
args.items.splice(.. 0, applied.items.iter().cloned());
- callee(ctx, args)
+ wrapped.call(ctx, args)
});
Ok(Value::Func(func))