go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-05 03:17:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Teach fn to capture returns

Browse Source
This commit is contained in:
Cheer Xiao 2015-07-08 12:31:40 +02:00
parent 892ba3c28c
commit b4ed398564
1 changed files with 19 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
eval/builtin_special.go
View File

@ -371,6 +371,22 @@ func compileUse(cc *compileCtx, fn *parse.Form) exitusOp {
}
}
// makeFnOp wraps a valuesOp such that a return is converted to a success.
func makeFnOp(op valuesOp) valuesOp {
f := func(ec *evalCtx) []Value {
vs := op.f(ec)
if len(vs) == 1 {
if e, ok := vs[0].(exitus); ok {
if e.Sort == Return {
return []Value{newFlowExitus(Success)}
}
}
}
return vs
}
return valuesOp{op.tr, f}
}
// FnForm = 'fn' StringPrimary { VariablePrimary } ClosurePrimary
//
// fn defines a function. This isn't strictly needed, since user-defined
@ -419,7 +435,9 @@ func compileFn(cc *compileCtx, fn *parse.Form) exitusOp {
cc.pushVar(varName, callableType{})
return func(ec *evalCtx) exitus {
ec.local[varName] = newInternalVariable(op.f(ec)[0], callableType{})
closure := op.f(ec)[0].(*closure)
closure.Op = makeFnOp(closure.Op)
ec.local[varName] = newInternalVariable(closure, callableType{})
return success
}
}