Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 9 additions & 2 deletions checker/nature/nature.go
Original file line number Diff line number Diff line change
Expand Up @@ -404,8 +404,15 @@ func (n *Nature) getSlow(c *Cache, name string) (Nature, bool) {
if nt, ok := n.MethodByName(c, name); ok {
return nt, true
}
if n.Kind == reflect.Struct {
if sf := n.structField(c, nil, name); sf != nil {
t, k, changed := deref.TypeKind(n.Type, n.Kind)
if k == reflect.Struct {
var sd *structData
if changed {
sd = c.getStruct(t).structData
} else {
sd = n.structData
}
if sf := sd.structField(c, nil, name); sf != nil {
return sf.Nature, true
}
}
Expand Down
15 changes: 10 additions & 5 deletions test/issues/840/issue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,23 +8,28 @@ import (
)

func TestEnvFieldMethods(t *testing.T) {
program, err := expr.Compile(`Func(0)`, expr.Env(&Env{}))
program, err := expr.Compile(`Func() + Int`, expr.Env(&Env{}))
require.NoError(t, err)

env := &Env{}
env.Func = func() int {
return 42
return 40
}
env.EmbeddedEnv = &EmbeddedEnv{
Int: 2,
}

out, err := expr.Run(program, Env{})
out, err := expr.Run(program, env)
require.NoError(t, err)

require.Equal(t, 42, out)
}

type Env struct {
EmbeddedEnv
*EmbeddedEnv
Func func() int
}

type EmbeddedEnv struct{}
type EmbeddedEnv struct {
Int int
}
Loading