Merge branch 'master' into vm-and-runtime-improvements

Author: diegommm

README.md

@@ -149,9 +149,9 @@ func main() {
 * [GoDaddy](https://godaddy.com) employs Expr for the customization of its GoDaddy Pro product.
 * [ByteDance](https://bytedance.com) incorporates Expr into its internal business rule engine.
 * [Aviasales](https://aviasales.ru) utilizes Expr as a business rule engine for its flight search engine.
-* [Wish.com](https://www.wish.com) employs Expr in its decision-making rule engine for the Wish Assistant.
-* [Naoma.AI](https://www.naoma.ai) uses Expr as a part of its call scoring engine.
+* [Alibaba](https://alibaba.com) uses Expr in a web framework for building recommendation services.
 * [Argo](https://argoproj.github.io) integrates Expr into Argo Rollouts and Argo Workflows for Kubernetes.
+* [Wish.com](https://www.wish.com) employs Expr in its decision-making rule engine for the Wish Assistant.
 * [OpenTelemetry](https://opentelemetry.io) integrates Expr into the OpenTelemetry Collector.
 * [Philips Labs](https://github.com/philips-labs/tabia) employs Expr in Tabia, a tool designed to collect insights on their code bases.
 * [CrowdSec](https://crowdsec.net) incorporates Expr into its security automation tool.
@@ -172,6 +172,7 @@ func main() {
 * [FastSchema](https://github.com/fastschema/fastschema) - A BaaS leveraging Expr for its customizable and dynamic Access Control system.
 * [WunderGraph Cosmo](https://github.com/wundergraph/cosmo) - GraphQL Federeration Router uses Expr to customize Middleware behaviour
 * [SOLO](https://solo.one) uses Expr interally to allow dynamic code execution with custom defined functions.
+* [Naoma.AI](https://www.naoma.ai) uses Expr as a part of its call scoring engine.
 
 [Add your company too](https://github.com/expr-lang/expr/edit/master/README.md)
 

expr_test.go

@@ -2318,23 +2318,16 @@ func TestEval_slices_out_of_bound(t *testing.T) {
 	}
 }
 
-func TestExpr_custom_tests(t *testing.T) {
-	f, err := os.Open("custom_tests.json")
-	if os.IsNotExist(err) {
-		t.Skip("no custom tests")
-		return
+func TestExpr_timeout(t *testing.T) {
+	tests := []struct{ code string }{
+		{`-999999..999999`},
+		{`map(1..999999, 1..999999)`},
+		{`map(1..999999, repeat('a', #))`},
 	}
 
-	require.NoError(t, err, "open file error")
-	defer f.Close()
-
-	var tests []string
-	err = json.NewDecoder(f).Decode(&tests)
-	require.NoError(t, err, "decode json error")
-
-	for id, tt := range tests {
-		t.Run(fmt.Sprintf("line %v", id+2), func(t *testing.T) {
-			program, err := expr.Compile(tt)
+	for _, tt := range tests {
+		t.Run(tt.code, func(t *testing.T) {
+			program, err := expr.Compile(tt.code)
 			require.NoError(t, err)
 
 			timeout := make(chan bool, 1)

test/issues/840/issue_test.go

@@ -0,0 +1,30 @@
+package issue_test
+
+import (
+	"testing"
+
+	"github.com/expr-lang/expr"
+	"github.com/expr-lang/expr/internal/testify/require"
+)
+
+func TestEnvFieldMethods(t *testing.T) {
+	program, err := expr.Compile(`Func(0)`, expr.Env(&Env{}))
+	require.NoError(t, err)
+
+	env := &Env{}
+	env.Func = func() int {
+		return 42
+	}
+
+	out, err := expr.Run(program, Env{})
+	require.NoError(t, err)
+
+	require.Equal(t, 42, out)
+}
+
+type Env struct {
+	EmbeddedEnv
+	Func func() int
+}
+
+type EmbeddedEnv struct{}