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
7 changes: 4 additions & 3 deletions ast/node.go
Original file line number Diff line number Diff line change
Expand Up @@ -168,9 +168,10 @@ type MemberNode struct {
// array[1:4]
type SliceNode struct {
base
Node Node // Node of the slice. Like "array" in "array[1:4]".
From Node // From an index of the array. Like "1" in "array[1:4]".
To Node // To an index of the array. Like "4" in "array[1:4]".
Node Node // Node of the slice. Like "array" in "array[1:4]".
From Node // From an index of the array. Like "1" in "array[1:4]".
To Node // To an index of the array. Like "4" in "array[1:4]".
Optional bool // If true then the slice access is optional. Like "foo?.[1:4]".
}

// CallNode represents a function or a method call.
Expand Down
12 changes: 8 additions & 4 deletions ast/print.go
Original file line number Diff line number Diff line change
Expand Up @@ -162,16 +162,20 @@ func (n *MemberNode) String() string {
}

func (n *SliceNode) String() string {
op := ""
if n.Optional {
op = "?."
}
if n.From == nil && n.To == nil {
return fmt.Sprintf("%s[:]", n.Node.String())
return fmt.Sprintf("%s%s[:]", n.Node.String(), op)
}
if n.From == nil {
return fmt.Sprintf("%s[:%s]", n.Node.String(), n.To.String())
return fmt.Sprintf("%s%s[:%s]", n.Node.String(), op, n.To.String())
}
if n.To == nil {
return fmt.Sprintf("%s[%s:]", n.Node.String(), n.From.String())
return fmt.Sprintf("%s%s[%s:]", n.Node.String(), op, n.From.String())
}
return fmt.Sprintf("%s[%s:%s]", n.Node.String(), n.From.String(), n.To.String())
return fmt.Sprintf("%s%s[%s:%s]", n.Node.String(), op, n.From.String(), n.To.String())
}

func (n *CallNode) String() string {
Expand Down
3 changes: 3 additions & 0 deletions checker/checker.go
Original file line number Diff line number Diff line change
Expand Up @@ -613,6 +613,9 @@ func (v *Checker) sliceNode(node *ast.SliceNode) Nature {
case reflect.String, reflect.Array, reflect.Slice:
// ok
default:
if node.Optional {
return Nature{}
}
return v.error(node, "cannot slice %s", nt.String())
}

Expand Down
4 changes: 4 additions & 0 deletions compiler/compiler.go
Original file line number Diff line number Diff line change
Expand Up @@ -760,6 +760,10 @@ func (c *compiler) MemberNode(node *ast.MemberNode) {

func (c *compiler) SliceNode(node *ast.SliceNode) {
c.compile(node.Node)
if node.Optional && len(c.chains) > 0 {
ph := c.emit(OpJumpIfNil, placeholder)
c.chains[len(c.chains)-1] = append(c.chains[len(c.chains)-1], ph)
}
if node.To != nil {
c.compile(node.To)
c.derefInNeeded(node.To)
Expand Down
24 changes: 19 additions & 5 deletions parser/parser.go
Original file line number Diff line number Diff line change
Expand Up @@ -848,12 +848,19 @@ func (p *Parser) parsePostfixExpression(node Node) Node {
}

node = p.createNode(&SliceNode{
Node: node,
To: to,
Node: node,
To: to,
Optional: optional,
}, postfixToken.Location)
if node == nil {
return nil
}
if optional {
node = p.createNode(&ChainNode{Node: node}, postfixToken.Location)
if node == nil {
return nil
}
}
p.expect(Bracket, "]")

} else {
Expand All @@ -868,13 +875,20 @@ func (p *Parser) parsePostfixExpression(node Node) Node {
}

node = p.createNode(&SliceNode{
Node: node,
From: from,
To: to,
Node: node,
From: from,
To: to,
Optional: optional,
}, postfixToken.Location)
if node == nil {
return nil
}
if optional {
node = p.createNode(&ChainNode{Node: node}, postfixToken.Location)
if node == nil {
return nil
}
}
p.expect(Bracket, "]")

} else {
Expand Down
46 changes: 46 additions & 0 deletions test/issues/822/issue_test.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
package issue_test

import (
"testing"

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

func TestIssue822(t *testing.T) {
t.Run("nil optional slice returns nil", func(t *testing.T) {
program, err := expr.Compile(`let x = nil; x?.[0:1]`)
require.NoError(t, err)

out, err := expr.Run(program, nil)
require.NoError(t, err)
require.Nil(t, out)
})

t.Run("non-nil optional slice works normally", func(t *testing.T) {
program, err := expr.Compile(`let x = [1, 2, 3]; x?.[0:2]`)
require.NoError(t, err)

out, err := expr.Run(program, nil)
require.NoError(t, err)
require.Equal(t, []interface{}{1, 2}, out)
})

t.Run("nil optional slice without from", func(t *testing.T) {
program, err := expr.Compile(`let x = nil; x?.[:1]`)
require.NoError(t, err)

out, err := expr.Run(program, nil)
require.NoError(t, err)
require.Nil(t, out)
})

t.Run("nil optional slice without to", func(t *testing.T) {
program, err := expr.Compile(`let x = nil; x?.[1:]`)
require.NoError(t, err)

out, err := expr.Run(program, nil)
require.NoError(t, err)
require.Nil(t, out)
})
}