Skip to content
Open
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: 6 additions & 5 deletions conf/env.go
Original file line number Diff line number Diff line change
Expand Up @@ -30,24 +30,25 @@ func EnvWithCache(c *Cache, env any) Nature {
}

v := reflect.ValueOf(env)
d := deref.Value(v)
t := v.Type()

switch deref.Value(v).Kind() {
switch d.Kind() {
case reflect.Struct:
n := c.FromType(t)
n.Strict = true
return n

case reflect.Map:
n := c.FromType(v.Type())
n := c.FromType(d.Type())
if n.TypeData == nil {
n.TypeData = new(TypeData)
}
n.Strict = true
n.Fields = make(map[string]Nature, v.Len())
n.Fields = make(map[string]Nature, d.Len())

for _, key := range v.MapKeys() {
elem := v.MapIndex(key)
for _, key := range d.MapKeys() {
elem := d.MapIndex(key)
if !elem.IsValid() || !elem.CanInterface() {
panic(fmt.Sprintf("invalid map value: %s", key))
}
Expand Down
20 changes: 20 additions & 0 deletions test/issues/825/issue_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package main

import (
"testing"

"github.com/expr-lang/expr"
"github.com/expr-lang/expr/internal/testify/require"
)

func TestIssue825(t *testing.T) {
m := map[string]any{"foo": 42}
env := &m

prog, err := expr.Compile("foo > 0", expr.Env(env))
require.NoError(t, err)

out, err := expr.Run(prog, env)
require.NoError(t, err)
require.Equal(t, true, out)
}
4 changes: 4 additions & 0 deletions vm/vm.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,10 @@ type VM struct {
}

func (vm *VM) Run(program *Program, env any) (_ any, err error) {
if m, ok := env.(*map[string]any); ok && m != nil {
env = *m
}

defer func() {
if r := recover(); r != nil {
var location file.Location
Expand Down
Loading