fix: correctly store boolean result for branching operations

.github/ISSUE_TEMPLATE/bug_report.md

@@ -17,11 +17,11 @@ func main() {
 Expected result:
 ```console
 $ go run ./sample.go
-// ouput
+// output
 ```
 
 Got:
 ```console
 $ yaegi ./sample.go
-// ouput
+// output
 ```

.golangci.toml

@@ -5,7 +5,7 @@
 [linters-settings]
 
   [linters-settings.govet]
-    check-shadowing = true
+    check-shadowing = false
 
   [linters-settings.gocyclo]
     min-complexity = 12.0
@@ -32,7 +32,11 @@
     "gocyclo",
     "gochecknoinits",
     "gochecknoglobals",
-    "typecheck", # v1.17.1 and Go1.13 => bug
+    "wsl",
+    "godox",
+    "funlen",
+    "gocognit",
+    "stylecheck",
   ]
 
 [issues]
@@ -41,10 +45,13 @@
   max-same-issues = 0
   exclude = []
 
-  [[issues.exclude-rules]]
-    path = "cmd/goexports/goexports.go"
-    text = "SA1019: importer.For is deprecated: use ForCompiler, which populates a FileSet with the positions of objects created by the importer."
-
   [[issues.exclude-rules]]
     path = "interp/.+_test\\.go"
     linters = ["goconst"]
+
+  [[issues.exclude-rules]]
+    path = "interp/interp.go"
+    text = "`in` can be `io.Reader`"
+  [[issues.exclude-rules]]
+    path = "interp/interp.go"
+    text = "`out` can be `io.Writer`"

.travis.yml

@@ -19,7 +19,6 @@ cache:
 matrix:
   fast_finish: true
   include:
-    - go: 1.11.x
     - go: 1.12.x
     - go: 1.13.x
       env: STABLE=true

CONTRIBUTING.md

@@ -13,7 +13,12 @@ discussions.
 Once the proposal is approved, a Pull Request can be opened. If you want
 to provide early visibility to reviewers, create a [Draft Pull Request].
 
+We will also require you to sign the [Containous Contributor License Agreement]
+after you submit your first pull request to this project. The link to sign the
+agreement will be presented to you in the web interface of the pull request.
+
 [Issues]: https://github.com/containous/yaegi/issues
 [Pull Requests]: https://github.com/containous/yaegi/issues
 [Feature Request]: https://github.com/containous/yaegi/issues/new?template=feature_request.md
 [Draft Pull Request]: https://github.blog/2019-02-14-introducing-draft-pull-requests/
+[Containous Contributor License Agreement]: https://cla-assistant.io/containous/yaegi

Makefile

@@ -18,5 +18,6 @@ generate: gen_all_syscall
 
 tests:
 	GO111MODULE=off go test -v ./...
+	GO111MODULE=off go test -race ./interp
 
 .PHONY: check gen_all_syscall gen_tests

README.md

@@ -129,6 +129,24 @@ $ yaegi cmd/yaegi/yaegi.go
 >
 ```
 
+Or for Go scripting in the shebang line:
+
+```console
+$ cat /tmp/test
+#!/usr/bin/env yaegi
+package main
+
+import "fmt"
+
+func main() {
+	fmt.Println("test")
+}
+$ ls -la /tmp/test
+-rwxr-xr-x 1 dow184 dow184 93 Jan  6 13:38 /tmp/test
+$ /tmp/test
+test
+```
+
 ## Documentation
 
 Documentation about Yaegi commands and libraries can be found at usual [godoc.org][docs].

_test/a33.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{1, 2, 3}
+	b := a
+	fmt.Println(b)
+}
+
+// Output:
+// [1 2 3]

_test/a34.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{1, 2, 3}
+	var b [3]int = a
+	fmt.Println(b)
+}
+
+// Output:
+// [1 2 3]

_test/a35.go

@@ -0,0 +1,13 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{1, 2, 3}
+	b := a
+	b[0] = -1
+	fmt.Println(a)
+}
+
+// Output:
+// [1 2 3]

_test/a36.go

@@ -0,0 +1,13 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{1, 2, 3}
+	var b [3]int = a
+	b[0] = -1
+	fmt.Println(a)
+}
+
+// Output:
+// [1 2 3]

_test/a37.go

@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{1, 2, 3}
+	fmt.Println(a)
+}
+
+// Output:
+// [1 2 3]

_test/a38.go

@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]byte{}
+	fmt.Printf("%T\n", a)
+}
+
+// Output:
+// [0]uint8

_test/a39.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]byte{}
+	b := a
+	fmt.Printf("%T %T\n", a, b)
+}
+
+// Output:
+// [0]uint8 [0]uint8

_test/a40.go

@@ -0,0 +1,23 @@
+package main
+
+import "fmt"
+
+type rule uint8
+
+const (
+	r0 rule = iota
+	r1
+	r2
+)
+
+var a = [...]int{
+	r0: 1,
+	r1: 12,
+}
+
+func main() {
+	fmt.Println(a)
+}
+
+// Output:
+// [1 12]

_test/a41.go

@@ -0,0 +1,10 @@
+package main
+
+var a = [...]bool{true, true}
+
+func main() {
+	println(a[0] && true)
+}
+
+// Output:
+// true

_test/and3.go

@@ -0,0 +1,10 @@
+package main
+
+var a = true && true
+
+func main() {
+	println(a)
+}
+
+// Output:
+// true

_test/assign10.go

@@ -0,0 +1,10 @@
+package main
+
+func main() {
+	var a uint
+	a = 1 + 2
+	println(a)
+}
+
+// Output:
+// 3

_test/b1/foo/foo.go

@@ -0,0 +1,7 @@
+package foo
+
+import bar "github.com/containous/yaegi/_test/b2/foo"
+
+var Desc = "in b1/foo"
+
+var Desc2 = Desc + bar.Desc

_test/b2/foo/foo.go

@@ -0,0 +1,3 @@
+package foo
+
+var Desc = "in b2/foo"

_test/bin2.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+	"math"
+)
+
+func main() {
+	fmt.Println(math.Abs(-5))
+}
+
+// Output:
+// 5

_test/chan8.go

@@ -0,0 +1,12 @@
+package main
+
+func main() {
+	messages := make(chan bool)
+
+	go func() { messages <- true }()
+
+	println(<-messages && true)
+}
+
+// Output:
+// true

_test/closure8.go

@@ -0,0 +1,10 @@
+package main
+
+var f = func(a int) int { return 2 + a }
+
+func main() {
+	println(f(3))
+}
+
+// Output:
+// 5

_test/complex1.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+func main() {
+	var c complex128
+	c = 1
+	fmt.Printf("%T %v\n", c, c)
+}
+
+// Output:
+// complex128 (1+0i)

_test/complex2.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+func main() {
+	c := complex(1, 0)
+	c += 1
+	fmt.Printf("%T %v\n", c, c)
+}
+
+// Output:
+// complex128 (2+0i)

_test/complex3.go

@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func main() {
+	var s int = 1 + complex(1, 0)
+	fmt.Printf("%T %v\n", s, s)
+}
+
+// Output
+// int 2

_test/composite3.go

@@ -0,0 +1,12 @@
+package main
+
+func main() {
+	var err error
+	var ok bool
+
+	_, ok = err.(interface{ IsSet() bool })
+	println(ok)
+}
+
+// Output:
+// false

_test/composite4.go

@@ -0,0 +1,11 @@
+package main
+
+func main() {
+	var err error
+
+	_, ok := err.(interface{ IsSet() bool })
+	println(ok)
+}
+
+// Output:
+// false

_test/composite5.go

@@ -0,0 +1,16 @@
+package main
+
+import "fmt"
+
+type T struct {
+	m uint16
+}
+
+var t = T{1<<2 | 1<<3}
+
+func main() {
+	fmt.Println(t)
+}
+
+// Output:
+// {12}

_test/composite6.go

@@ -0,0 +1,20 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/containous/yaegi/_test/ct1"
+)
+
+type T struct {
+	m uint16
+}
+
+var t = T{1 << ct1.R}
+
+func main() {
+	fmt.Println(t)
+}
+
+// Output:
+// {2}

_test/const6.go

@@ -0,0 +1,22 @@
+package main
+
+const (
+	maxNonStarters = 30
+	maxBufferSize  = maxNonStarters + 2
+)
+
+type reorderBuffer struct {
+	rune [maxBufferSize]Properties
+}
+
+type Properties struct {
+	pos  uint8
+	size uint8
+}
+
+func main() {
+	println(len(reorderBuffer{}.rune))
+}
+
+// Output:
+// 32

_test/const7.go

@@ -0,0 +1,19 @@
+package main
+
+import "fmt"
+
+const (
+	a = iota
+	b
+	c
+	d
+)
+
+type T [c]int
+
+func main() {
+	fmt.Println(T{})
+}
+
+// Output:
+// [0 0]

_test/ct/ct1.go

@@ -0,0 +1,3 @@
+package ct
+
+func init() { println("hello from ct1") }

_test/ct/ct2.go

@@ -0,0 +1,5 @@
+// +build !dummy
+
+package ct
+
+func init() { println("hello from ct2") }

_test/ct/ct3.go

@@ -0,0 +1,5 @@
+// +build dummy
+
+package ct
+
+func init() { println("hello from ct3") }

_test/ct1/ct1.go

@@ -0,0 +1,9 @@
+package ct1
+
+type Class uint
+
+const (
+	L Class = iota
+	R
+	AL
+)

_test/foo-bar/foo-bar.go

@@ -0,0 +1,3 @@
+package bar
+
+var Name = "foo-bar"

_test/for7.go

@@ -0,0 +1,9 @@
+package main
+
+func main() {
+	for i := 0; i; {
+	}
+}
+
+// Error:
+// 4:14: non-bool used as for condition

_test/for8.go

@@ -0,0 +1,18 @@
+package main
+
+func main() {
+	for i := 0; i < 4; i++ {
+		for {
+			break
+		}
+		if i == 1 {
+			continue
+		}
+		println(i)
+	}
+}
+
+// Output:
+// 0
+// 2
+// 3

_test/fun10.go

@@ -0,0 +1,19 @@
+package main
+
+import "fmt"
+
+func f() func() {
+	return nil
+}
+
+func main() {
+	g := f()
+	fmt.Printf("%T %v\n", g, g)
+	if g == nil {
+		fmt.Println("nil func")
+	}
+}
+
+// Output:
+// func() <nil>
+// nil func

_test/fun11.go

@@ -0,0 +1,12 @@
+package main
+
+var f F
+
+type F func(int)
+
+func main() {
+	println("ok")
+}
+
+// Output:
+// ok

_test/if2.go

@@ -0,0 +1,13 @@
+package main
+
+import "fmt"
+
+func main() {
+	var i int
+	if i % 1000000 {
+		fmt.Println("oops")
+	}
+}
+
+// Error:
+// 7:5: non-bool used as if condition

_test/import7.go

@@ -0,0 +1,10 @@
+package main
+
+import "github.com/containous/yaegi/_test/foo-bar"
+
+func main() {
+	println(bar.Name)
+}
+
+// Output:
+// foo-bar

_test/import8.go

@@ -0,0 +1,10 @@
+package main
+
+import "github.com/containous/yaegi/_test/b1/foo"
+
+func main() {
+	println(foo.Desc)
+}
+
+// Output:
+// in b1/foo

_test/interface12.go

@@ -0,0 +1,18 @@
+package main
+
+type I1 interface {
+	Truc()
+}
+
+type T1 struct{}
+
+func (T1) Truc() { println("in T1 truc") }
+
+var x I1 = T1{}
+
+func main() {
+	x.Truc()
+}
+
+// Output:
+// in T1 truc

_test/interface13.go

@@ -0,0 +1,32 @@
+package main
+
+import (
+	"fmt"
+)
+
+type X struct{}
+
+func (X) Foo() int {
+	return 1
+}
+func (X) Bar() int {
+	return 2
+}
+
+type Foo interface {
+	Foo() int
+}
+type Bar interface {
+	Bar() int
+}
+
+func main() {
+	var x X
+	var i Foo = x
+	j := i.(Bar)
+
+	fmt.Println(j.Bar())
+}
+
+// Output:
+// 2

_test/interface14.go

@@ -0,0 +1,17 @@
+package main
+
+type T struct{}
+
+func (t *T) Error() string { return "T: error" }
+
+var invalidT = &T{}
+
+func main() {
+	var err error
+	if err != invalidT {
+		println("ok")
+	}
+}
+
+// Output:
+// ok

_test/interface15.go

@@ -0,0 +1,28 @@
+package main
+
+type Fooer interface {
+	Foo() string
+}
+
+type Barer interface {
+	//fmt.Stringer
+	Fooer
+	Bar()
+}
+
+type T struct{}
+
+func (t *T) Foo() string { return "T: foo" }
+func (*T) Bar()          { println("in bar") }
+
+var t = &T{}
+
+func main() {
+	var f Barer
+	if f != t {
+		println("ok")
+	}
+}
+
+// Output:
+// ok

_test/interface16.go

@@ -0,0 +1,25 @@
+package main
+
+import "fmt"
+
+type Barer interface {
+	fmt.Stringer
+	Bar()
+}
+
+type T struct{}
+
+func (*T) String() string { return "T: nothing" }
+func (*T) Bar()           { println("in bar") }
+
+var t = &T{}
+
+func main() {
+	var f Barer
+	if f != t {
+		println("ok")
+	}
+}
+
+// Output:
+// ok

_test/interface17.go

@@ -0,0 +1,17 @@
+package main
+
+type T struct{}
+
+func (t T) Error() string { return "T: error" }
+
+var invalidT = T{}
+
+func main() {
+	var err error
+	if err != invalidT {
+		println("ok")
+	}
+}
+
+// Output:
+// ok

_test/interface18.go

@@ -0,0 +1,18 @@
+package main
+
+type T struct{}
+
+func (t *T) Error() string { return "T: error" }
+func (*T) Foo()            { println("foo") }
+
+var invalidT = &T{}
+
+func main() {
+	var err error
+	if err != invalidT {
+		println("ok")
+	}
+}
+
+// Output:
+// ok

_test/interface19.go

@@ -0,0 +1,12 @@
+package main
+
+import "fmt"
+
+var I interface{}
+
+func main() {
+	fmt.Printf("%T %v\n", I, I)
+}
+
+// Output:
+// <nil> <nil>

_test/map19.go

@@ -0,0 +1,16 @@
+package main
+
+import "fmt"
+
+type cmap struct {
+	servers map[int64]*server
+}
+
+type server struct {
+	cm *cmap
+}
+
+func main() {
+	m := cmap{}
+	fmt.Println(m)
+}

_test/map20.go

@@ -0,0 +1,10 @@
+package main
+
+var a = map[int]bool{1: true, 2: true}
+
+func main() {
+	println(a[1] && true)
+}
+
+// Output:
+// true

_test/math1.go

@@ -0,0 +1,13 @@
+package main
+
+import "math"
+
+func main() {
+	var f float32
+	if f < math.MaxFloat32 {
+		println("ok")
+	}
+}
+
+// Output:
+// ok

_test/method28.go

@@ -0,0 +1,18 @@
+package main
+
+import "fmt"
+
+type T struct {
+	Name string
+}
+
+func (T) create() *T {
+	return &T{"Hello"}
+}
+
+func main() {
+	fmt.Println(T{}.create())
+}
+
+// Output:
+// &{Hello}

_test/method29.go

@@ -0,0 +1,16 @@
+package main
+
+import (
+	"context"
+	"net"
+)
+
+var lookupHost = net.DefaultResolver.LookupHost
+
+func main() {
+	res, err := lookupHost(context.Background(), "localhost")
+	println(len(res) > 0, err == nil)
+}
+
+// Output:
+// true true

_test/method30.go

@@ -0,0 +1,20 @@
+package main
+
+type T struct {
+	Name string
+}
+
+func (t *T) foo(a string) string {
+	return t.Name + a
+}
+
+var g = &T{"global"}
+
+var f = g.foo
+
+func main() {
+	println(f("-x"))
+}
+
+// Output:
+// global-x

_test/method31.go

@@ -0,0 +1,29 @@
+package main
+
+import "fmt"
+
+var db dbWrapper
+
+type dbWrapper struct {
+	DB *cmap
+}
+
+func (d *dbWrapper) get() *cmap {
+	return d.DB
+}
+
+type cmap struct {
+	name string
+}
+
+func (c *cmap) f() {
+	fmt.Println("in f, c", c)
+}
+
+func main() {
+	db.DB = &cmap{name: "test"}
+	db.get().f()
+}
+
+// Output:
+// in f, c &{test}

_test/nil0.go

@@ -0,0 +1,15 @@
+package main
+
+import "fmt"
+
+func f() (host, port string, err error) {
+	return "", "", nil
+}
+
+func main() {
+	h, p, err := f()
+	fmt.Println(h, p, err)
+}
+
+// Output:
+//   <nil>

_test/nil1.go

@@ -0,0 +1,12 @@
+package main
+
+func main() {
+	var a error = nil
+
+	if a == nil || a.Error() == "nil" {
+		println("a is nil")
+	}
+}
+
+// Output:
+// a is nil

_test/op4.go

@@ -0,0 +1,9 @@
+package main
+
+func main() {
+	i := 100
+	println(i % 1e2)
+}
+
+// Output:
+// 0

_test/or0.go

@@ -0,0 +1,9 @@
+package main
+
+func main() {
+	c := false
+	println(c || !c)
+}
+
+// Output:
+// true

_test/or1.go

@@ -0,0 +1,9 @@
+package main
+
+func main() {
+	c := false
+	println(!c || c)
+}
+
+// Output:
+// true

_test/or2.go

@@ -0,0 +1,10 @@
+package main
+
+var a = false || true
+
+func main() {
+	println(a)
+}
+
+// Output:
+// true

_test/primes.go

@@ -0,0 +1,26 @@
+package main
+
+func Primes(n int) int {
+	var xs []int
+	for i := 2; len(xs) < n; i++ {
+		ok := true
+		for _, x := range xs {
+			if i%x == 0 {
+				ok = false
+				break
+			}
+		}
+		if !ok {
+			continue
+		}
+		xs = append(xs, i)
+	}
+	return xs[n-1]
+}
+
+func main() {
+	println(Primes(3))
+}
+
+// Output:
+// 5

_test/ptr8.go

@@ -0,0 +1,10 @@
+package main
+
+var a = func() *bool { b := true; return &b }()
+
+func main() {
+	println(*a && true)
+}
+
+// Output:
+// true

_test/range0.go

@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+func main() {
+	v := []int{1, 2, 3}
+	for i := range v {
+		v = append(v, i)
+	}
+	fmt.Println(v)
+}
+
+// Output:
+// [1 2 3 0 1 2]

_test/range1.go

@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{2, 1, 0}
+	for _, v := range a {
+		a[v] = v
+	}
+	fmt.Println(a)
+}
+
+// Output:
+// [0 1 2]

_test/range2.go

@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := [...]int{2, 1, 0}
+	for _, v := range &a {
+		a[v] = v
+	}
+	fmt.Println(a)
+}
+
+// Output:
+// [2 1 2]

_test/range3.go

@@ -0,0 +1,14 @@
+package main
+
+import "fmt"
+
+func main() {
+	m := map[int]bool{1: true, 3: true, 5: true}
+	for k := range m {
+		m[k*2] = true
+	}
+	fmt.Println("ok")
+}
+
+// Output:
+// ok

_test/range4.go

@@ -0,0 +1,15 @@
+package main
+
+import "fmt"
+
+func main() {
+	m := map[int]bool{1: true, 3: true, 5: true}
+	for _, v := range m {
+		fmt.Println(v)
+	}
+}
+
+// Output:
+// true
+// true
+// true

_test/range5.go

@@ -0,0 +1,15 @@
+package main
+
+import "fmt"
+
+func main() {
+	m := map[int]bool{1: true, 3: true, 5: true}
+	var n int
+	for range m {
+		n++
+	}
+	fmt.Println(n)
+}
+
+// Output:
+// 3

_test/range6.go

@@ -0,0 +1,18 @@
+package main
+
+import (
+	"fmt"
+	"math"
+)
+
+func main() {
+	m := map[float64]bool{math.NaN(): true, math.NaN(): true, math.NaN(): true}
+	for _, v := range m {
+		fmt.Println(v)
+	}
+}
+
+// Output:
+// true
+// true
+// true

_test/ret7.go

@@ -0,0 +1,11 @@
+package main
+
+func one() uint {
+	return 1
+}
+func main() {
+	println(one())
+}
+
+// Output:
+// 1

_test/str3.go

@@ -0,0 +1,11 @@
+package main
+
+import "strconv"
+
+func main() {
+	str := strconv.Itoa(101)
+	println(str[0] == '1')
+}
+
+// Output:
+// true

_test/str4.go

@@ -0,0 +1,11 @@
+package main
+
+import "unicode/utf8"
+
+func main() {
+	r, _ := utf8.DecodeRuneInString("Hello")
+	println(r < utf8.RuneSelf)
+}
+
+// Output:
+// true

_test/struct29.go

@@ -0,0 +1,19 @@
+package main
+
+type T1 struct {
+	A []T2
+	B []T2
+}
+
+type T2 struct {
+	name string
+}
+
+var t = T1{}
+
+func main() {
+	println("ok")
+}
+
+// Output:
+// ok

_test/struct30.go

@@ -0,0 +1,19 @@
+package main
+
+type T1 struct {
+	A []T2
+	M map[uint64]T2
+}
+
+type T2 struct {
+	name string
+}
+
+var t = T1{}
+
+func main() {
+	println("ok")
+}
+
+// Output:
+// ok

_test/struct31.go

@@ -0,0 +1,14 @@
+package main
+
+type T struct {
+	bool
+}
+
+var t = T{true}
+
+func main() {
+	println(t.bool && true)
+}
+
+// Output:
+// true

_test/switch21.go

@@ -0,0 +1,17 @@
+package main
+
+import "fmt"
+
+func main() {
+	var err error
+
+	switch v := err.(type) {
+	case fmt.Formatter:
+		println("formatter")
+	default:
+		fmt.Println(v)
+	}
+}
+
+// Output:
+// <nil>

_test/switch22.go

@@ -0,0 +1,21 @@
+package main
+
+type T struct {
+	Name string
+}
+
+func f(t interface{}) {
+	switch ext := t.(type) {
+	case *T:
+		println("*T", ext.Name)
+	default:
+		println("unknown")
+	}
+}
+
+func main() {
+	f(&T{"truc"})
+}
+
+// Output:
+// *T truc

_test/tag0.go

@@ -0,0 +1,15 @@
+// The following comment line has the same effect as 'go run -tags=dummy'
+//yaegi:tags dummy
+
+package main
+
+import _ "github.com/containous/yaegi/_test/ct"
+
+func main() {
+	println("bye")
+}
+
+// Output:
+// hello from ct1
+// hello from ct3
+// bye

_test/time10.go

@@ -0,0 +1,13 @@
+package main
+
+import "time"
+
+var UnixTime func(int64, int64) time.Time
+
+func main() {
+	UnixTime = time.Unix
+	println(UnixTime(1e9, 0).In(time.UTC).Minute())
+}
+
+// Output:
+// 46

_test/time11.go

@@ -0,0 +1,15 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+const df = time.Minute * 30
+
+func main() {
+	fmt.Printf("df: %v %T\n", df, df)
+}
+
+// Output:
+// df: 30m0s time.Duration

_test/time9.go

@@ -0,0 +1,13 @@
+package main
+
+import (
+	"fmt"
+	"time"
+)
+
+func main() {
+	fmt.Println((5 * time.Minute).Seconds())
+}
+
+// Output:
+// 300

_test/type15.go

@@ -0,0 +1,9 @@
+package main
+
+func main() {
+	err := error(nil)
+	println(err == nil)
+}
+
+// Output:
+// true

_test/type16.go

@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := uint8(15) ^ byte(0)
+	fmt.Printf("%T %v\n", a, a)
+}
+
+// Output:
+// uint8 15

_test/type17.go

@@ -0,0 +1,11 @@
+package main
+
+import "fmt"
+
+func main() {
+	a := int32(15) ^ rune(0)
+	fmt.Printf("%T %v\n", a, a)
+}
+
+// Output:
+// int32 15

_test/var10.go

@@ -0,0 +1,11 @@
+package main
+
+var _ = true
+var _ = "hello"
+
+func main() {
+	println("hello")
+}
+
+// Output:
+// hello

_test/var11.go

@@ -0,0 +1,10 @@
+package main
+
+var a, _, _, b = 1, true, "foo", 2
+
+func main() {
+	println(a, b)
+}
+
+// Output:
+// 1 2

_test/var9.go

@@ -0,0 +1,11 @@
+package main
+
+var a = "sdofjsdfj"
+var z = a[0:2]
+
+func main() {
+	println(z)
+}
+
+// Output:
+// sd

cmd/goexports/goexports.go

@@ -1,7 +1,7 @@
 //go:generate go build
 
 /*
-Goexports generates wrappers of package exported symbols
+Goexports generates wrappers of package exported symbols.
 
 Output files are written in the current directory, and prefixed with the go version.
 
@@ -26,6 +26,7 @@ import (
 	"go/constant"
 	"go/format"
 	"go/importer"
+	"go/token"
 	"go/types"
 	"io/ioutil"
 	"log"
@@ -114,7 +115,7 @@ type Wrap struct {
 }
 
 func genContent(dest, pkgName, license string) ([]byte, error) {
-	p, err := importer.For("source", nil).Import(pkgName)
+	p, err := importer.ForCompiler(token.NewFileSet(), "source", nil).Import(pkgName)
 	if err != nil {
 		return nil, err
 	}
@@ -147,7 +148,12 @@ func genContent(dest, pkgName, license string) ([]byte, error) {
 		pname := path.Base(pkgName) + "." + name
 		switch o := o.(type) {
 		case *types.Const:
-			val[name] = Val{fixConst(pname, o.Val()), false}
+			if b, ok := o.Type().(*types.Basic); ok && (b.Info()&types.IsUntyped) != 0 {
+				// convert untyped constant to right type to avoid overflow
+				val[name] = Val{fixConst(pname, o.Val()), false}
+			} else {
+				val[name] = Val{pname, false}
+			}
 		case *types.Func:
 			val[name] = Val{pname, false}
 		case *types.Var:
@@ -248,7 +254,14 @@ func genContent(dest, pkgName, license string) ([]byte, error) {
 
 // fixConst checks untyped constant value, converting it if necessary to avoid overflow
 func fixConst(name string, val constant.Value) string {
-	if val.Kind() == constant.Int {
+	switch val.Kind() {
+	case constant.Float:
+		str := val.ExactString()
+		if _, err := strconv.ParseFloat(str, 32); err == nil {
+			return "float32(" + name + ")"
+		}
+		return name
+	case constant.Int:
 		str := val.ExactString()
 		i, err := strconv.ParseInt(str, 0, 64)
 		if err == nil {
@@ -265,8 +278,10 @@ func fixConst(name string, val constant.Value) string {
 		if err == nil {
 			return "uint64(" + name + ")"
 		}
+		return name
+	default:
+		return name
 	}
-	return name
 }
 
 // genLicense generates the correct LICENSE header text from the provided

cmd/yaegi/yaegi.go

@@ -8,7 +8,7 @@ If invoked with no arguments, it processes the standard input
 in a Read-Eval-Print-Loop. A prompt is displayed if standard input
 is a terminal.
 
-Given a file, it operates on that file. if the first line starts with
+Given a file, it operates on that file. If the first line starts with
 "#!/usr/bin/env yaegi", and the file has exec permission, then the file
 can be invoked directly from the shell.
 
@@ -18,7 +18,10 @@ at global level in an implicit main package.
 
 Options:
     -i
-	   start an interactive REPL after file execution
+	   start an interactive REPL after file execution.
+	-tags tag,list
+	   a comma-separated list of build tags to consider satisfied during
+	   the interpretation.
 
 Debugging support (may be removed at any time):
   YAEGI_AST_DOT=1
@@ -43,7 +46,9 @@ import (
 
 func main() {
 	var interactive bool
+	var tags string
 	flag.BoolVar(&interactive, "i", false, "start an interactive REPL")
+	flag.StringVar(&tags, "tags", "", "set a list of build tags")
 	flag.Usage = func() {
 		fmt.Println("Usage:", os.Args[0], "[options] [script] [args]")
 		fmt.Println("Options:")
@@ -53,7 +58,7 @@ func main() {
 	args := flag.Args()
 	log.SetFlags(log.Lshortfile)
 
-	i := interp.New(interp.Options{GoPath: build.Default.GOPATH})
+	i := interp.New(interp.Options{GoPath: build.Default.GOPATH, BuildTags: strings.Split(tags, ",")})
 	i.Use(stdlib.Symbols)
 	i.Use(interp.Symbols)
 
@@ -79,9 +84,9 @@ func main() {
 		}
 
 		if interactive {
-			i.Repl(os.Stdin, os.Stdout)
+			i.REPL(os.Stdin, os.Stdout)
 		}
 	} else {
-		i.Repl(os.Stdin, os.Stdout)
+		i.REPL(os.Stdin, os.Stdout)
 	}
 }

cmd/yaegi/yaegi_test.go

@@ -0,0 +1,91 @@
+package main
+
+import (
+	"bytes"
+	"io/ioutil"
+	"os"
+	"os/exec"
+	"path/filepath"
+	"testing"
+	"time"
+)
+
+func TestYaegiCmdCancel(t *testing.T) {
+	tmp, err := ioutil.TempDir("", "yaegi-")
+	if err != nil {
+		t.Fatalf("failed to create tmp directory: %v", err)
+	}
+	defer func() {
+		err = os.RemoveAll(tmp)
+		if err != nil {
+			t.Errorf("failed to clean up %v: %v", tmp, err)
+		}
+	}()
+
+	yaegi := filepath.Join(tmp, "yaegi")
+	build := exec.Command("go", "build", "-race", "-o", yaegi, ".")
+	err = build.Run()
+	if err != nil {
+		t.Fatalf("failed to build yaegi command: %v", err)
+	}
+
+	// Test src must be terminated by a single newline.
+	tests := []string{
+		"for {}\n",
+		"select {}\n",
+	}
+	for _, src := range tests {
+		cmd := exec.Command(yaegi)
+		in, err := cmd.StdinPipe()
+		if err != nil {
+			t.Errorf("failed to get stdin pipe to yaegi command: %v", err)
+		}
+		var outBuf, errBuf bytes.Buffer
+		cmd.Stdout = &outBuf
+		cmd.Stderr = &errBuf
+
+		// https://golang.org/doc/articles/race_detector.html#Options
+		cmd.Env = []string{`GORACE="halt_on_error=1"`}
+
+		err = cmd.Start()
+		if err != nil {
+			t.Fatalf("failed to start yaegi command: %v", err)
+		}
+
+		_, err = in.Write([]byte(src))
+		if err != nil {
+			t.Errorf("failed pipe test source to yaegi command: %v", err)
+		}
+		time.Sleep(100 * time.Millisecond)
+		err = cmd.Process.Signal(os.Interrupt)
+		if err != nil {
+			t.Errorf("failed to send os.Interrupt to yaegi command: %v", err)
+		}
+
+		_, err = in.Write([]byte("1+1\n"))
+		if err != nil {
+			t.Errorf("failed to probe race: %v", err)
+		}
+		err = in.Close()
+		if err != nil {
+			t.Errorf("failed to close stdin pipe: %v", err)
+		}
+
+		err = cmd.Wait()
+		if err != nil {
+			if cmd.ProcessState.ExitCode() == 66 { // See race_detector.html article.
+				t.Errorf("race detected running yaegi command canceling %q: %v", src, err)
+				if testing.Verbose() {
+					t.Log(&errBuf)
+				}
+			} else {
+				t.Errorf("error running yaegi command for %q: %v", src, err)
+			}
+			continue
+		}
+
+		if outBuf.String() != "context canceled\n2\n" {
+			t.Errorf("unexpected output: %q", &outBuf)
+		}
+	}
+}

example/pkg/pkg_test.go

@@ -69,7 +69,6 @@ func TestPackages(t *testing.T) {
 	for _, test := range testCases {
 		test := test
 		t.Run(test.desc, func(t *testing.T) {
-
 			goPath, err := filepath.Abs(test.goPath)
 			if err != nil {
 				t.Fatal(err)
@@ -116,7 +115,6 @@ func TestPackagesError(t *testing.T) {
 	for _, test := range testCases {
 		test := test
 		t.Run(test.desc, func(t *testing.T) {
-
 			// Init go interpreter
 			i := interp.New(interp.Options{GoPath: test.goPath})
 			i.Use(stdlib.Symbols) // Use binary standard library

go.mod

@@ -1,3 +1,3 @@
 module github.com/containous/yaegi
 
-go 1.11
+go 1.12

internal/genop/genop.go

@@ -10,7 +10,7 @@ import (
 
 const model = `package interp
 
-// Code generated by 'go run ../cmd/genop/genop.go'. DO NOT EDIT.
+// Code generated by 'go run ../internal/genop/genop.go'. DO NOT EDIT.
 
 import "reflect"
 
@@ -352,6 +352,30 @@ func {{$name}}(n *node) {
 	}
 }
 {{end}}
+{{range $name, $op := .Unary}}
+func {{$name}}Const(n *node) {
+	t := n.typ.rtype
+	v := n.child[0].rval
+	n.rval = reflect.New(t).Elem()
+
+	{{- if $op.Bool}}
+	n.rval.SetBool({{$op.Name}} v.Bool())
+	{{- else}}
+	switch t.Kind() {
+	case reflect.Int, reflect.Int8, reflect.Int16, reflect.Int32, reflect.Int64:
+		n.rval.SetInt({{$op.Name}} v.Int())
+	case reflect.Uint, reflect.Uint8, reflect.Uint16, reflect.Uint32, reflect.Uint64, reflect.Uintptr:
+		n.rval.SetUint({{$op.Name}} v.Uint())
+	{{- if $op.Float}}
+	case reflect.Float32, reflect.Float64:
+		n.rval.SetFloat({{$op.Name}} v.Float())
+	case reflect.Complex64, reflect.Complex128:
+		n.rval.SetComplex({{$op.Name}} v.Complex())
+	{{- end}}
+	}
+	{{- end}}
+}
+{{end}}
 {{range $name, $op := .Comparison}}
 func {{$name}}(n *node) {
 	tnext := getExec(n.tnext)
@@ -427,148 +451,6 @@ func {{$name}}(n *node) {
 				}
 			}
 		}
-	{{- if $op.Complex}}
-	case isComplex(t0) || isComplex(t1):
-		switch {
-		case c0.rval.IsValid():
-			s0 := vComplex(c0.rval)
-			v1 := genValueComplex(c1)
-			if n.fnext != nil {
-				fnext := getExec(n.fnext)
-				n.exec = func(f *frame) bltn {
-					_, s1 := v1(f)
-					if s0 {{$op.Name}} s1 {
-						dest(f).SetBool(true)
-						return tnext
-					}
-					dest(f).SetBool(false)
-					return fnext
-				}
-			} else {
-				n.exec = func(f *frame) bltn {
-					_, s1 := v1(f)
-					dest(f).SetBool(s0 {{$op.Name}} s1)
-					return tnext
-				}
-			}
-		case c1.rval.IsValid():
-			s1 := vComplex(c1.rval)
-			v0 := genValueComplex(c0)
-			if n.fnext != nil {
-				fnext := getExec(n.fnext)
-				n.exec = func(f *frame) bltn {
-					_, s0 := v0(f)
-					if s0 {{$op.Name}} s1 {
-						dest(f).SetBool(true)
-						return tnext
-					}
-					dest(f).SetBool(false)
-					return fnext
-				}
-			} else {
-				dest := genValue(n)
-				n.exec = func(f *frame) bltn {
-					_, s0 := v0(f)
-					dest(f).SetBool(s0 {{$op.Name}} s1)
-					return tnext
-				}
-			}
-		default:
-			v0 := genValueComplex(n.child[0])
-			v1 := genValueComplex(n.child[1])
-			if n.fnext != nil {
-				fnext := getExec(n.fnext)
-				n.exec = func(f *frame) bltn {
-					_, s0 := v0(f)
-					_, s1 := v1(f)
-					if s0 {{$op.Name}} s1 {
-						dest(f).SetBool(true)
-						return tnext
-					}
-					dest(f).SetBool(false)
-					return fnext
-				}
-			} else {
-				n.exec = func(f *frame) bltn {
-					_, s0 := v0(f)
-					_, s1 := v1(f)
-					dest(f).SetBool(s0 {{$op.Name}} s1)
-					return tnext
-				}
-			}
-		}
-	default:
-		switch {
-		case c0.rval.IsValid():
-			i0 := c0.rval.Interface()
-			v1 := genValue(c1)
-			if n.fnext != nil {
-				fnext := getExec(n.fnext)
-				n.exec = func(f *frame) bltn {
-					i1 := v1(f).Interface()
-					if i0 {{$op.Name}} i1 {
-						dest(f).SetBool(true)
-						return tnext
-					}
-					dest(f).SetBool(false)
-					return fnext
-				}
-			} else {
-				dest := genValue(n)
-				n.exec = func(f *frame) bltn {
-					i1 := v1(f).Interface()
-					dest(f).SetBool(i0 {{$op.Name}} i1)
-					return tnext
-				}
-			}
-		case c1.rval.IsValid():
-			i1 := c1.rval.Interface()
-			v0 := genValue(c0)
-			if n.fnext != nil {
-				fnext := getExec(n.fnext)
-				n.exec = func(f *frame) bltn {
-					i0 := v0(f).Interface()
-					if i0 {{$op.Name}} i1 {
-						dest(f).SetBool(true)
-						return tnext
-					}
-					dest(f).SetBool(false)
-					return fnext
-				}
-			} else {
-				dest := genValue(n)
-				n.exec = func(f *frame) bltn {
-					i0 := v0(f).Interface()
-					dest(f).SetBool(i0 {{$op.Name}} i1)
-					return tnext
-				}
-			}
-		default:
-			v0 := genValue(c0)
-			v1 := genValue(c1)
-			if n.fnext != nil {
-				fnext := getExec(n.fnext)
-				n.exec = func(f *frame) bltn {
-					i0 := v0(f).Interface()
-					i1 := v1(f).Interface()
-					if i0 {{$op.Name}} i1 {
-						dest(f).SetBool(true)
-						return tnext
-					}
-					dest(f).SetBool(false)
-					return fnext
-				}
-			} else {
-				dest := genValue(n)
-				n.exec = func(f *frame) bltn {
-					i0 := v0(f).Interface()
-					i1 := v1(f).Interface()
-					dest(f).SetBool(i0 {{$op.Name}} i1)
-					return tnext
-				}
-			}
-		}
-	{{- end}}
 	case isFloat(t0) || isFloat(t1):
 		switch {
 		case c0.rval.IsValid():
@@ -781,6 +663,148 @@ func {{$name}}(n *node) {
 				}
 			}
 		}
+	{{- if $op.Complex}}
+	case isComplex(t0) || isComplex(t1):
+		switch {
+		case c0.rval.IsValid():
+			s0 := vComplex(c0.rval)
+			v1 := genComplex(c1)
+			if n.fnext != nil {
+				fnext := getExec(n.fnext)
+				n.exec = func(f *frame) bltn {
+					s1 := v1(f)
+					if s0 {{$op.Name}} s1 {
+						dest(f).SetBool(true)
+						return tnext
+					}
+					dest(f).SetBool(false)
+					return fnext
+				}
+			} else {
+				n.exec = func(f *frame) bltn {
+					s1 := v1(f)
+					dest(f).SetBool(s0 {{$op.Name}} s1)
+					return tnext
+				}
+			}
+		case c1.rval.IsValid():
+			s1 := vComplex(c1.rval)
+			v0 := genComplex(c0)
+			if n.fnext != nil {
+				fnext := getExec(n.fnext)
+				n.exec = func(f *frame) bltn {
+					s0 := v0(f)
+					if s0 {{$op.Name}} s1 {
+						dest(f).SetBool(true)
+						return tnext
+					}
+					dest(f).SetBool(false)
+					return fnext
+				}
+			} else {
+				dest := genValue(n)
+				n.exec = func(f *frame) bltn {
+					s0 := v0(f)
+					dest(f).SetBool(s0 {{$op.Name}} s1)
+					return tnext
+				}
+			}
+		default:
+			v0 := genComplex(n.child[0])
+			v1 := genComplex(n.child[1])
+			if n.fnext != nil {
+				fnext := getExec(n.fnext)
+				n.exec = func(f *frame) bltn {
+					s0 := v0(f)
+					s1 := v1(f)
+					if s0 {{$op.Name}} s1 {
+						dest(f).SetBool(true)
+						return tnext
+					}
+					dest(f).SetBool(false)
+					return fnext
+				}
+			} else {
+				n.exec = func(f *frame) bltn {
+					s0 := v0(f)
+					s1 := v1(f)
+					dest(f).SetBool(s0 {{$op.Name}} s1)
+					return tnext
+				}
+			}
+		}
+	default:
+		switch {
+		case c0.rval.IsValid():
+			i0 := c0.rval.Interface()
+			v1 := genValue(c1)
+			if n.fnext != nil {
+				fnext := getExec(n.fnext)
+				n.exec = func(f *frame) bltn {
+					i1 := v1(f).Interface()
+					if i0 {{$op.Name}} i1 {
+						dest(f).SetBool(true)
+						return tnext
+					}
+					dest(f).SetBool(false)
+					return fnext
+				}
+			} else {
+				dest := genValue(n)
+				n.exec = func(f *frame) bltn {
+					i1 := v1(f).Interface()
+					dest(f).SetBool(i0 {{$op.Name}} i1)
+					return tnext
+				}
+			}
+		case c1.rval.IsValid():
+			i1 := c1.rval.Interface()
+			v0 := genValue(c0)
+			if n.fnext != nil {
+				fnext := getExec(n.fnext)
+				n.exec = func(f *frame) bltn {
+					i0 := v0(f).Interface()
+					if i0 {{$op.Name}} i1 {
+						dest(f).SetBool(true)
+						return tnext
+					}
+					dest(f).SetBool(false)
+					return fnext
+				}
+			} else {
+				dest := genValue(n)
+				n.exec = func(f *frame) bltn {
+					i0 := v0(f).Interface()
+					dest(f).SetBool(i0 {{$op.Name}} i1)
+					return tnext
+				}
+			}
+		default:
+			v0 := genValue(c0)
+			v1 := genValue(c1)
+			if n.fnext != nil {
+				fnext := getExec(n.fnext)
+				n.exec = func(f *frame) bltn {
+					i0 := v0(f).Interface()
+					i1 := v1(f).Interface()
+					if i0 {{$op.Name}} i1 {
+						dest(f).SetBool(true)
+						return tnext
+					}
+					dest(f).SetBool(false)
+					return fnext
+				}
+			} else {
+				dest := genValue(n)
+				n.exec = func(f *frame) bltn {
+					i0 := v0(f).Interface()
+					i1 := v1(f).Interface()
+					dest(f).SetBool(i0 {{$op.Name}} i1)
+					return tnext
+				}
+			}
+		}
+	{{- end}}
 	}
 }
 {{end}}
@@ -793,6 +817,7 @@ type Op struct {
 	Float   bool   // true if operator applies to float
 	Complex bool   // true if operator applies to complex
 	Shift   bool   // true if operator is a shift operation
+	Bool    bool   // true if operator applies to bool
 }
 
 func main() {
@@ -805,17 +830,17 @@ func main() {
 	b := &bytes.Buffer{}
 	data := map[string]interface{}{
 		"Arithmetic": map[string]Op{
-			"add":    {"+", true, true, true, false},
+			"add":    {"+", true, true, true, false, false},
-			"sub":    {"-", false, true, true, false},
+			"sub":    {"-", false, true, true, false, false},
-			"mul":    {"*", false, true, true, false},
+			"mul":    {"*", false, true, true, false, false},
-			"quo":    {"/", false, true, true, false},
+			"quo":    {"/", false, true, true, false, false},
-			"rem":    {"%", false, false, false, false},
+			"rem":    {"%", false, false, false, false, false},
-			"shl":    {"<<", false, false, false, true},
+			"shl":    {"<<", false, false, false, true, false},
-			"shr":    {">>", false, false, false, true},
+			"shr":    {">>", false, false, false, true, false},
-			"and":    {"&", false, false, false, false},
+			"and":    {"&", false, false, false, false, false},
-			"or":     {"|", false, false, false, false},
+			"or":     {"|", false, false, false, false, false},
-			"xor":    {"^", false, false, false, false},
+			"xor":    {"^", false, false, false, false, false},
-			"andNot": {"&^", false, false, false, false},
+			"andNot": {"&^", false, false, false, false, false},
 		},
 		"IncDec": map[string]Op{
 			"inc": {Name: "+"},
@@ -829,6 +854,12 @@ func main() {
 			"lowerEqual":   {Name: "<=", Complex: false},
 			"notEqual":     {Name: "!=", Complex: true},
 		},
+		"Unary": map[string]Op{
+			"not":    {Name: "!", Float: false, Bool: true},
+			"neg":    {Name: "-", Float: true, Bool: false},
+			"pos":    {Name: "+", Float: true, Bool: false},
+			"bitNot": {Name: "^", Float: false, Bool: false},
+		},
 	}
 	if err = parse.Execute(b, data); err != nil {
 		log.Fatal(err)

interp/ast.go

@@ -6,8 +6,10 @@ import (
 	"go/parser"
 	"go/scanner"
 	"go/token"
+	"math"
 	"reflect"
 	"strconv"
+	"sync/atomic"
 )
 
 // nkind defines the kind of AST, i.e. the grammar category
@@ -73,8 +75,6 @@ const (
 	parenExpr
 	rangeStmt
 	returnStmt
-	rvalueExpr
-	rtypeExpr
 	selectStmt
 	selectorExpr
 	selectorImport
@@ -152,8 +152,6 @@ var kinds = [...]string{
 	parenExpr:        "parenExpr",
 	rangeStmt:        "rangeStmt",
 	returnStmt:       "returnStmt",
-	rvalueExpr:       "rvalueExpr",
-	rtypeExpr:        "rtypeExpr",
 	selectStmt:       "selectStmt",
 	selectorExpr:     "selectorExpr",
 	selectorImport:   "selectorImport",
@@ -197,6 +195,7 @@ const (
 	aAndAssign
 	aAndNot
 	aAndNotAssign
+	aBitNot
 	aCall
 	aCase
 	aCompositeLit
@@ -215,11 +214,12 @@ const (
 	aMethod
 	aMul
 	aMulAssign
-	aNegate
+	aNeg
 	aNot
 	aNotEqual
 	aOr
 	aOrAssign
+	aPos
 	aQuo
 	aQuoAssign
 	aRange
@@ -253,6 +253,7 @@ var actions = [...]string{
 	aAndAssign:    "&=",
 	aAndNot:       "&^",
 	aAndNotAssign: "&^=",
+	aBitNot:       "^",
 	aCall:         "call",
 	aCase:         "case",
 	aCompositeLit: "compositeLit",
@@ -269,11 +270,12 @@ var actions = [...]string{
 	aMethod:       "Method",
 	aMul:          "*",
 	aMulAssign:    "*=",
-	aNegate:       "-",
+	aNeg:          "-",
 	aNot:          "!",
 	aNotEqual:     "!=",
 	aOr:           "|",
 	aOrAssign:     "|=",
+	aPos:          "+",
 	aQuo:          "/",
 	aQuoAssign:    "/=",
 	aRange:        "range",
@@ -320,6 +322,7 @@ func (interp *Interpreter) firstToken(src string) token.Token {
 func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 	inRepl := name == ""
 	var inFunc bool
+	var mode parser.Mode
 
 	// Allow incremental parsing of declarations or statements, by inserting
 	// them in a pseudo file package or function. Those statements or
@@ -334,26 +337,30 @@ func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 			inFunc = true
 			src = "package main; func main() {" + src + "}"
 		}
+		// Parse comments in REPL mode, to allow tag setting
+		mode |= parser.ParseComments
 	}
 
-	if ok, err := interp.buildOk(interp.context, name, src); !ok || err != nil {
+	if ok, err := interp.buildOk(&interp.context, name, src); !ok || err != nil {
 		return "", nil, err // skip source not matching build constraints
 	}
 
-	f, err := parser.ParseFile(interp.fset, name, src, 0)
+	f, err := parser.ParseFile(interp.fset, name, src, mode)
 	if err != nil {
 		return "", nil, err
 	}
 
+	setYaegiTags(&interp.context, f.Comments)
+
 	var root *node
 	var anc astNode
 	var st nodestack
 	var pkgName string
 
 	addChild := func(root **node, anc astNode, pos token.Pos, kind nkind, act action) *node {
-		interp.nindex++
 		var i interface{}
-		n := &node{anc: anc.node, interp: interp, index: interp.nindex, pos: pos, kind: kind, action: act, val: &i, gen: builtin[act]}
+		nindex := atomic.AddInt64(&interp.nindex, 1)
+		n := &node{anc: anc.node, interp: interp, index: nindex, pos: pos, kind: kind, action: act, val: &i, gen: builtin[act]}
 		n.start = n
 		if anc.node == nil {
 			*root = n
@@ -364,15 +371,15 @@ func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 				if len(ancAst.List)+len(ancAst.Body) == len(anc.node.child) {
 					// All case clause children are collected.
 					// Split children in condition and body nodes to desambiguify the AST.
-					interp.nindex++
+					nindex = atomic.AddInt64(&interp.nindex, 1)
-					body := &node{anc: anc.node, interp: interp, index: interp.nindex, pos: pos, kind: caseBody, action: aNop, val: &i, gen: nop}
+					body := &node{anc: anc.node, interp: interp, index: nindex, pos: pos, kind: caseBody, action: aNop, val: &i, gen: nop}
 
 					if ts := anc.node.anc.anc; ts.kind == typeSwitch && ts.child[1].action == aAssign {
 						// In type switch clause, if a switch guard is assigned, duplicate the switch guard symbol
 						// in each clause body, so a different guard type can be set in each clause
 						name := ts.child[1].child[0].ident
-						interp.nindex++
+						nindex = atomic.AddInt64(&interp.nindex, 1)
-						gn := &node{anc: body, interp: interp, ident: name, index: interp.nindex, pos: pos, kind: identExpr, action: aNop, val: &i, gen: nop}
+						gn := &node{anc: body, interp: interp, ident: name, index: nindex, pos: pos, kind: identExpr, action: aNop, val: &i, gen: nop}
 						body.child = append(body.child, gn)
 					}
 
@@ -459,7 +466,11 @@ func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 				n.rval = reflect.ValueOf(v)
 			case token.FLOAT:
 				v, _ := strconv.ParseFloat(a.Value, 64)
-				n.rval = reflect.ValueOf(v)
+				if math.Trunc(v) == v {
+					n.rval = reflect.ValueOf(int(v))
+				} else {
+					n.rval = reflect.ValueOf(v)
+				}
 			case token.IMAG:
 				v, _ := strconv.ParseFloat(a.Value[:len(a.Value)-1], 64)
 				n.rval = reflect.ValueOf(complex(0, v))
@@ -548,6 +559,9 @@ func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 		case *ast.CommClause:
 			st.push(addChild(&root, anc, pos, commClause, aNop), nod)
 
+		case *ast.CommentGroup:
+			return false
+
 		case *ast.CompositeLit:
 			st.push(addChild(&root, anc, pos, compositeLitExpr, aCompositeLit), nod)
 
@@ -757,6 +771,8 @@ func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 			var kind = unaryExpr
 			var act action
 			switch a.Op {
+			case token.ADD:
+				act = aPos
 			case token.AND:
 				kind = addressExpr
 				act = aAddr
@@ -765,7 +781,9 @@ func (interp *Interpreter) ast(src, name string) (string, *node, error) {
 			case token.NOT:
 				act = aNot
 			case token.SUB:
-				act = aNegate
+				act = aNeg
+			case token.XOR:
+				act = aBitNot
 			}
 			st.push(addChild(&root, anc, pos, kind, act), nod)
 
@@ -839,9 +857,9 @@ func (s *nodestack) top() astNode {
 
 // dup returns a duplicated node subtree
 func (interp *Interpreter) dup(nod, anc *node) *node {
-	interp.nindex++
+	nindex := atomic.AddInt64(&interp.nindex, 1)
 	n := *nod
-	n.index = interp.nindex
+	n.index = nindex
 	n.anc = anc
 	n.start = &n
 	n.pos = anc.pos

interp/build.go

@@ -1,6 +1,7 @@
 package interp
 
 import (
+	"go/ast"
 	"go/build"
 	"go/parser"
 	"path"
@@ -11,7 +12,7 @@ import (
 // buildOk returns true if a file or script matches build constraints
 // as specified in https://golang.org/pkg/go/build/#hdr-Build_Constraints.
 // An error from parser is returned as well.
-func (interp *Interpreter) buildOk(ctx build.Context, name, src string) (bool, error) {
+func (interp *Interpreter) buildOk(ctx *build.Context, name, src string) (bool, error) {
 	// Extract comments before the first clause
 	f, err := parser.ParseFile(interp.fset, name, src, parser.PackageClauseOnly|parser.ParseComments)
 	if err != nil {
@@ -25,12 +26,13 @@ func (interp *Interpreter) buildOk(ctx build.Context, name, src string) (bool, e
 			}
 		}
 	}
+	setYaegiTags(ctx, f.Comments)
 	return true, nil
 }
 
 // buildLineOk returns true if line is not a build constraint or
 // if build constraint is satisfied
-func buildLineOk(ctx build.Context, line string) (ok bool) {
+func buildLineOk(ctx *build.Context, line string) (ok bool) {
 	if len(line) < 7 || line[:7] != "+build " {
 		return true
 	}
@@ -45,7 +47,7 @@ func buildLineOk(ctx build.Context, line string) (ok bool) {
 }
 
 // buildOptionOk return true if all comma separated tags match, false otherwise
-func buildOptionOk(ctx build.Context, tag string) bool {
+func buildOptionOk(ctx *build.Context, tag string) bool {
 	// in option, evaluate the AND of individual tags
 	for _, t := range strings.Split(tag, ",") {
 		if !buildTagOk(ctx, t) {
@@ -57,7 +59,7 @@ func buildOptionOk(ctx build.Context, tag string) bool {
 
 // buildTagOk returns true if a build tag matches, false otherwise
 // if first character is !, result is negated
-func buildTagOk(ctx build.Context, s string) (r bool) {
+func buildTagOk(ctx *build.Context, s string) (r bool) {
 	not := s[0] == '!'
 	if not {
 		s = s[1:]
@@ -82,6 +84,25 @@ func buildTagOk(ctx build.Context, s string) (r bool) {
 	return
 }
 
+// setYaegiTags scans a comment group for "yaegi:tags tag1 tag2 ..." lines
+// and adds the corresponding tags to the interpreter build tags.
+func setYaegiTags(ctx *build.Context, comments []*ast.CommentGroup) {
+	for _, g := range comments {
+		for _, line := range strings.Split(strings.TrimSpace(g.Text()), "\n") {
+			if len(line) < 11 || line[:11] != "yaegi:tags " {
+				continue
+			}
+
+			tags := strings.Split(strings.TrimSpace(line[10:]), " ")
+			for _, tag := range tags {
+				if !contains(ctx.BuildTags, tag) {
+					ctx.BuildTags = append(ctx.BuildTags, tag)
+				}
+			}
+		}
+	}
+}
+
 func contains(tags []string, tag string) bool {
 	for _, t := range tags {
 		if t == tag {
@@ -92,7 +113,7 @@ func contains(tags []string, tag string) bool {
 }
 
 // goMinorVersion returns the go minor version number
-func goMinorVersion(ctx build.Context) int {
+func goMinorVersion(ctx *build.Context) int {
 	current := ctx.ReleaseTags[len(ctx.ReleaseTags)-1]
 
 	v := strings.Split(current, ".")
@@ -108,7 +129,7 @@ func goMinorVersion(ctx build.Context) int {
 }
 
 // skipFile returns true if file should be skipped
-func skipFile(ctx build.Context, p string) bool {
+func skipFile(ctx *build.Context, p string) bool {
 	if !strings.HasSuffix(p, ".go") {
 		return true
 	}

interp/build_test.go

@@ -44,7 +44,7 @@ func TestBuildTag(t *testing.T) {
 		test := test
 		src := test.src + "\npackage x"
 		t.Run(test.src, func(t *testing.T) {
-			if r, _ := i.buildOk(ctx, "", src); r != test.res {
+			if r, _ := i.buildOk(&ctx, "", src); r != test.res {
 				t.Errorf("got %v, want %v", r, test.res)
 			}
 		})
@@ -74,7 +74,7 @@ func TestBuildFile(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.src, func(t *testing.T) {
-			if r := skipFile(ctx, test.src); r != test.res {
+			if r := skipFile(&ctx, test.src); r != test.res {
 				t.Errorf("got %v, want %v", r, test.res)
 			}
 		})
@@ -106,7 +106,7 @@ func Test_goMinorVersion(t *testing.T) {
 	for _, test := range tests {
 		test := test
 		t.Run(test.desc, func(t *testing.T) {
-			minor := goMinorVersion(test.context)
+			minor := goMinorVersion(&test.context)
 
 			if minor != test.expected {
 				t.Errorf("got %v, want %v", minor, test.expected)