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
12 changes: 12 additions & 0 deletions checker/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -549,6 +549,13 @@ func (v *Checker) memberNode(node *ast.MemberNode) Nature {

switch base.Kind {
case reflect.Map:
// If the map key is a pointer, we should not dereference the property.
if !prop.AssignableTo(base.Key(&v.config.NtCache)) {
propDeref := prop.Deref(&v.config.NtCache)
if propDeref.AssignableTo(base.Key(&v.config.NtCache)) {
prop = propDeref
}
}
if !prop.AssignableTo(base.Key(&v.config.NtCache)) && !prop.IsUnknown(&v.config.NtCache) {
return v.error(node.Property, "cannot use %s to get an element from %s", prop.String(), base.String())
}
Expand All @@ -562,6 +569,7 @@ func (v *Checker) memberNode(node *ast.MemberNode) Nature {
return base.Elem(&v.config.NtCache)

case reflect.Array, reflect.Slice:
prop = prop.Deref(&v.config.NtCache)
if !prop.IsInteger && !prop.IsUnknown(&v.config.NtCache) {
return v.error(node.Property, "array elements can only be selected using an integer (got %s)", prop.String())
}
Expand Down Expand Up @@ -607,13 +615,15 @@ func (v *Checker) sliceNode(node *ast.SliceNode) Nature {

if node.From != nil {
from := v.visit(node.From)
from = from.Deref(&v.config.NtCache)
if !from.IsInteger && !from.IsUnknown(&v.config.NtCache) {
return v.error(node.From, "non-integer slice index %v", from.String())
}
}

if node.To != nil {
to := v.visit(node.To)
to = to.Deref(&v.config.NtCache)
if !to.IsInteger && !to.IsUnknown(&v.config.NtCache) {
return v.error(node.To, "non-integer slice index %v", to.String())
}
Expand Down Expand Up @@ -942,6 +952,7 @@ func (v *Checker) checkBuiltinGet(node *ast.BuiltinNode) Nature {

base := v.visit(node.Arguments[0])
prop := v.visit(node.Arguments[1])
prop = prop.Deref(&v.config.NtCache)

if id, ok := node.Arguments[0].(*ast.IdentifierNode); ok && id.Value == "$env" {
if s, ok := node.Arguments[1].(*ast.StringNode); ok {
Expand Down Expand Up @@ -1260,6 +1271,7 @@ func (v *Checker) sequenceNode(node *ast.SequenceNode) Nature {

func (v *Checker) conditionalNode(node *ast.ConditionalNode) Nature {
c := v.visit(node.Cond)
c = c.Deref(&v.config.NtCache)
if !c.IsBool() && !c.IsUnknown(&v.config.NtCache) {
return v.error(node.Cond, "non-bool expression (type %v) used as condition", c.String())
}
Expand Down
15 changes: 15 additions & 0 deletions compiler/compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -716,6 +716,18 @@ func (c *compiler) MemberNode(node *ast.MemberNode) {

if op == OpFetch {
c.compile(node.Property)
deref := true
// If the map key is a pointer, we should not dereference the property.
if node.Node.Type() != nil && node.Node.Type().Kind() == reflect.Map {
keyType := node.Node.Type().Key()
propType := node.Property.Type()
if propType != nil && propType.AssignableTo(keyType) {
deref = false
}
}
if deref {
c.derefInNeeded(node.Property)
}
c.emit(OpFetch)
} else {
c.emitLocation(node.Location(), op, c.addConstant(
Expand All @@ -728,11 +740,13 @@ func (c *compiler) SliceNode(node *ast.SliceNode) {
c.compile(node.Node)
if node.To != nil {
c.compile(node.To)
c.derefInNeeded(node.To)
} else {
c.emit(OpLen)
}
if node.From != nil {
c.compile(node.From)
c.derefInNeeded(node.From)
} else {
c.emitPush(0)
}
Expand Down Expand Up @@ -1213,6 +1227,7 @@ func (c *compiler) lookupVariable(name string) (int, bool) {

func (c *compiler) ConditionalNode(node *ast.ConditionalNode) {
c.compile(node.Cond)
c.derefInNeeded(node.Cond)
otherwise := c.emit(OpJumpIfFalse, placeholder)

c.emit(OpPop)
Expand Down
101 changes: 101 additions & 0 deletions test/issues/836/issue_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package issue_test

import (
"testing"

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

type InputStruct struct {
Enabled *bool `json:"enabled"`
}

func TestIssue836(t *testing.T) {
str := "foo"
ptrStr := &str
b := true
ptrBool := &b
i := 1
ptrInt := &i

env := map[string]interface{}{
"ptrStr": ptrStr,
"ptrBool": ptrBool,
"ptrInt": ptrInt,
"arr": []int{1, 2, 3},
"mapPtr": map[*int]int{ptrInt: 42},
}

t.Run("map access with pointer key", func(t *testing.T) {
program, err := expr.Compile(`{"foo": "bar"}[ptrStr]`, expr.Env(env))
require.NoError(t, err)

output, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, "bar", output)
})

t.Run("conditional with pointer condition", func(t *testing.T) {
program, err := expr.Compile(`ptrBool ? 1 : 0`, expr.Env(env))
require.NoError(t, err)

output, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, 1, output)
})

t.Run("get() with pointer key", func(t *testing.T) {
program, err := expr.Compile(`get({"foo": "bar"}, ptrStr)`, expr.Env(env))
require.NoError(t, err)

output, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, "bar", output)
})

t.Run("struct field pointer check in ternary", func(t *testing.T) {
var v InputStruct
// v.Enabled is nil

env := map[string]any{
"v": v,
}

code := `v.Enabled == nil ? 'default' : ( v.Enabled ? 'enabled' : 'disabled' )`

program, err := expr.Compile(code, expr.Env(env))
require.NoError(t, err)

output, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, "default", output)
})

t.Run("struct field pointer check in ternary (enabled)", func(t *testing.T) {
b := true
v := InputStruct{Enabled: &b}

env := map[string]any{
"v": v,
}

code := `v.Enabled == nil ? 'default' : ( v.Enabled ? 'enabled' : 'disabled' )`

program, err := expr.Compile(code, expr.Env(env))
require.NoError(t, err)

output, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, "enabled", output)
})

t.Run("slice with pointer indices", func(t *testing.T) {
program, err := expr.Compile(`arr[ptrInt:ptrInt]`, expr.Env(env))
require.NoError(t, err)

output, err := expr.Run(program, env)
require.NoError(t, err)
require.Equal(t, []int{}, output)
})
}
Loading