Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
5 changed files
with
184 additions
and
141 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| package optimizer | ||
|
|
||
| import ( | ||
| "fmt" | ||
|
|
||
| . "github.com/expr-lang/expr/ast" | ||
| ) | ||
|
|
||
| type sumArray struct{} | ||
|
|
||
| func (*sumArray) Visit(node *Node) { | ||
| if sumBuiltin, ok := (*node).(*BuiltinNode); ok && | ||
| sumBuiltin.Name == "sum" && | ||
| len(sumBuiltin.Arguments) == 1 { | ||
| if array, ok := sumBuiltin.Arguments[0].(*ArrayNode); ok && | ||
| len(array.Nodes) >= 2 { | ||
| Patch(node, sumArrayFold(array)) | ||
| } | ||
| } | ||
| } | ||
|
|
||
| func sumArrayFold(array *ArrayNode) *BinaryNode { | ||
| if len(array.Nodes) > 2 { | ||
| return &BinaryNode{ | ||
| Operator: "+", | ||
| Left: array.Nodes[0], | ||
| Right: sumArrayFold(&ArrayNode{Nodes: array.Nodes[1:]}), | ||
| } | ||
| } else if len(array.Nodes) == 2 { | ||
| return &BinaryNode{ | ||
| Operator: "+", | ||
| Left: array.Nodes[0], | ||
| Right: array.Nodes[1], | ||
| } | ||
| } | ||
| panic(fmt.Errorf("sumArrayFold: invalid array length %d", len(array.Nodes))) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,73 @@ | ||
| package optimizer_test | ||
|
|
||
| import ( | ||
| "testing" | ||
|
|
||
| "github.com/stretchr/testify/assert" | ||
| "github.com/stretchr/testify/require" | ||
|
|
||
| "github.com/expr-lang/expr" | ||
| "github.com/expr-lang/expr/ast" | ||
| "github.com/expr-lang/expr/optimizer" | ||
| "github.com/expr-lang/expr/parser" | ||
| "github.com/expr-lang/expr/vm" | ||
| ) | ||
|
|
||
| func BenchmarkSumArray(b *testing.B) { | ||
| env := map[string]any{ | ||
| "a": 1, | ||
| "b": 2, | ||
| "c": 3, | ||
| "d": 4, | ||
| } | ||
|
|
||
| program, err := expr.Compile(`sum([a, b, c, d])`, expr.Env(env)) | ||
| require.NoError(b, err) | ||
|
|
||
| var out any | ||
| b.ResetTimer() | ||
| for n := 0; n < b.N; n++ { | ||
| out, err = vm.Run(program, env) | ||
| } | ||
| b.StopTimer() | ||
|
|
||
| require.NoError(b, err) | ||
| require.Equal(b, 10, out) | ||
|
|
||
| } | ||
|
|
||
| func TestOptimize_sum_array(t *testing.T) { | ||
| tree, err := parser.Parse(`sum([a, b])`) | ||
| require.NoError(t, err) | ||
|
|
||
| err = optimizer.Optimize(&tree.Node, nil) | ||
| require.NoError(t, err) | ||
|
|
||
| expected := &ast.BinaryNode{ | ||
| Operator: "+", | ||
| Left: &ast.IdentifierNode{Value: "a"}, | ||
| Right: &ast.IdentifierNode{Value: "b"}, | ||
| } | ||
|
|
||
| assert.Equal(t, ast.Dump(expected), ast.Dump(tree.Node)) | ||
| } | ||
|
|
||
| func TestOptimize_sum_array_3(t *testing.T) { | ||
| tree, err := parser.Parse(`sum([a, b, c])`) | ||
| require.NoError(t, err) | ||
|
|
||
| err = optimizer.Optimize(&tree.Node, nil) | ||
| require.NoError(t, err) | ||
|
|
||
| expected := &ast.BinaryNode{ | ||
| Operator: "+", | ||
| Left: &ast.IdentifierNode{Value: "a"}, | ||
| Right: &ast.BinaryNode{ | ||
| Operator: "+", | ||
| Left: &ast.IdentifierNode{Value: "b"}, | ||
| Right: &ast.IdentifierNode{Value: "c"}, | ||
| }, | ||
| } | ||
|
|
||
| assert.Equal(t, ast.Dump(expected), ast.Dump(tree.Node)) | ||
| } |