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

pkg/eval: In (*Evaler).Eval, replace nil ports with placeholder ports.

Browse Source 
This allows callers of this method to only supply the ports it is interested in
setting and leave the rest either unspecified or nil.
This commit is contained in:
Qi Xiao 2021-01-02 02:22:44 +00:00
parent 7cd2745c03
commit 9b5dc09f14
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkg/eval/eval.go
View File

@ -265,9 +265,7 @@ func (fm *Frame) growPorts(n int) {
// Eval evaluates a piece of source code with the given configuration. The
// returned error may be a parse error, compilation error or exception.
func (ev *Evaler) Eval(src parse.Source, cfg EvalCfg) error {
if cfg.Ports == nil {
cfg.Ports = DevNullPorts[:]
}
cfg.Ports = fillPorts(cfg.Ports)
op, err := ev.ParseAndCompile(src, cfg.Ports[2].File)
if err != nil {
return err
@ -279,6 +277,22 @@ func (ev *Evaler) Eval(src parse.Source, cfg EvalCfg) error {
}
}
func fillPorts(ports []*Port) []*Port {
if len(ports) < 3 {
ports = append(ports, make([]*Port, 3-len(ports))...)
}
if ports[0] == nil {
ports[0] = DevNullClosedChan
}
if ports[1] == nil {
ports[1] = DevNullBlackholeChan
}
if ports[2] == nil {
ports[2] = DevNullBlackholeChan
}
return ports
}
// Executes an Op with the specified configuration.
func (ev *Evaler) execOp(op Op, cfg EvalCfg) error {
fm := NewTopFrame(ev, op.Src, cfg.Ports)