From 2fe3c4753fb790ad5ebde3fcbca056370ece9cb9 Mon Sep 17 00:00:00 2001 From: Přemysl Janouch Date: Wed, 10 Oct 2018 20:59:35 +0200 Subject: Go: make use of multiple return values --- cmd/interpreter/main.go | 4 +--- cmd/repl/main.go | 3 +-- 2 files changed, 2 insertions(+), 5 deletions(-) (limited to 'cmd') diff --git a/cmd/interpreter/main.go b/cmd/interpreter/main.go index bd70af3..e0001a2 100644 --- a/cmd/interpreter/main.go +++ b/cmd/interpreter/main.go @@ -53,9 +53,7 @@ func main() { for i := 2; i < len(os.Args); i++ { args = append(args, *ell.NewString(os.Args[i])) } - - var result []ell.V - if !L.EvalBlock(program, args, &result) { + if _, ok := L.EvalBlock(program, args); !ok { fmt.Printf("%s: %s\n", "runtime error", L.Error) } } diff --git a/cmd/repl/main.go b/cmd/repl/main.go index b1bb413..3511931 100644 --- a/cmd/repl/main.go +++ b/cmd/repl/main.go @@ -29,8 +29,7 @@ import ( ) func run(L *ell.Ell, program []ell.V) { - var result []ell.V - if !L.EvalBlock(program, nil, &result) { + if result, ok := L.EvalBlock(program, nil); !ok { fmt.Printf("\x1b[31m%s: %s\x1b[0m\n", "runtime error", L.Error) L.Error = "" } else { -- cgit v1.2.3-70-g09d2