go-sylixos/elvish
3
0
Fork 0
mirror of https://github.com/go-sylixos/elvish.git synced 2024-12-14 02:57:52 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Evaler.Eval take compiled Op.

Browse Source
This commit is contained in:
Qi Xiao 2016-10-13 22:05:29 +08:00
parent f0f8467fe3
commit 3ab967fc4d
2 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
eval/eval.go
View File

@ -139,13 +139,9 @@ func makeScope(s Namespace) scope {
// eval evaluates a chunk node n. The supplied name and text are used in
// diagnostic messages.
func (ev *Evaler) eval(name, text string, n *parse.Chunk, ports []*Port) (bool, error) {
op, err := ev.Compile(n, name, text)
if err != nil {
return false, err
}
func (ev *Evaler) eval(name, text string, op Op, ports []*Port) (bool, error) {
ec := NewTopEvalCtx(ev, name, text, ports)
err = ec.PEval(op)
err := ec.PEval(op)
return ec.verdict, err
}
@ -155,7 +151,7 @@ func (ec *EvalCtx) Interrupts() <-chan struct{} {
// Eval sets up the Evaler and evaluates a chunk. The supplied name and text are
// used in diagnostic messages.
func (ev *Evaler) Eval(name, text string, n *parse.Chunk) error {
func (ev *Evaler) Eval(name, text string, op Op) error {
inCh := make(chan Value)
close(inCh)
@ -216,7 +212,7 @@ func (ev *Evaler) Eval(name, text string, n *parse.Chunk) error {
close(sigGoRoutineDone)
}
ret, err := ev.eval(name, text, n, ports)
ret, err := ev.eval(name, text, op, ports)
close(outCh)
<-outDone
close(stopSigGoroutine)
@ -322,7 +318,11 @@ func (ev *Evaler) SourceText(name, src string) error {
if err != nil {
return err
}
return ev.Eval(name, src, n)
op, err := ev.Compile(n, name, src)
if err != nil {
return err
}
return ev.Eval(name, src, op)
}
func readFileUTF8(fname string) (string, error) {

14
run/run.go
View File

@ -204,10 +204,18 @@ func interact(ev *eval.Evaler, st *store.Store) {
cooldown = time.Second
n, err := parse.Parse(line)
printError(err, "[interactive]", "Parse error", line)
if err != nil {
printError(err, "[interactive]", "Parse error", line)
continue
}
if err == nil {
err := ev.Eval("[interactive]", line, n)
op, err := ev.Compile(n, "[interactive]", line)
if err != nil {
printError(err, "[interactive]", "Compile error", line)
continue
}
err = ev.Eval("[interactive]", line, op)
if err != nil {
printError(err, "[interactive]", "Exception", line)
}
}