cue/cuecontext: cuecontext.New observes evalv3 experiment by default

The default can still be overridden by setting the evaluator version directly in the API. Signed-off-by: Marcel van Lohuizen <[email protected]> Change-Id: If4dcdac20a42b012ff5c8a57553ddd178ea4e512 Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1202685 Unity-Result: CUE porcuepine <[email protected]> TryBot-Result: CUEcueckoo <[email protected]> Reviewed-by: Daniel Martí <[email protected]>
cue-lang · Oct 18, 2024 · be8ed35 · be8ed35
1 parent 860906a
commit be8ed35
Show file tree

Hide file tree

Showing 2 changed files with 36 additions and 1 deletion.
diff --git a/cue/cuecontext/cuecontext_test.go b/cue/cuecontext/cuecontext_test.go
@@ -20,6 +20,9 @@ import (
 
 	"cuelang.org/go/cue"
 	"cuelang.org/go/cue/ast"
+	"cuelang.org/go/internal"
+	"cuelang.org/go/internal/core/runtime"
+	"cuelang.org/go/internal/cueexperiment"
 )
 
 func TestAPI(t *testing.T) {
@@ -72,3 +75,26 @@ func TestConcurrency(t *testing.T) {
 		`)
 	}()
 }
+
+func TestEvalVersion(t *testing.T) {
+	cueexperiment.Init()
+	saved := cueexperiment.Flags.EvalV3
+	defer func() { cueexperiment.Flags.EvalV3 = saved }()
+
+	test := func(c *cue.Context, want internal.EvaluatorVersion) {
+		got, _ := (*runtime.Runtime)(c).Settings()
+		if got != want {
+			t.Errorf("got %v; want %v", got, want)
+		}
+	}
+
+	cueexperiment.Flags.EvalV3 = true
+
+	test(New(), internal.DevVersion)
+	test(New(EvaluatorVersion(EvalV2)), internal.DefaultVersion)
+	test(New(EvaluatorVersion(EvalV3)), internal.DevVersion)
+
+	cueexperiment.Flags.EvalV3 = false
+
+	test(New(), internal.DefaultVersion)
+}
diff --git a/internal/core/runtime/runtime.go b/internal/core/runtime/runtime.go
@@ -18,6 +18,7 @@ import (
 	"cuelang.org/go/cue/build"
 	"cuelang.org/go/internal"
 	"cuelang.org/go/internal/cuedebug"
+	"cuelang.org/go/internal/cueexperiment"
 )
 
 // A Runtime maintains data structures for indexing and reuse for evaluation.
@@ -59,8 +60,9 @@ func New() *Runtime {
 // debug flags. The builtins registered with RegisterBuiltin are available for
 // evaluation.
 func NewWithSettings(v internal.EvaluatorVersion, flags cuedebug.Config) *Runtime {
-	r := &Runtime{version: v, flags: flags}
+	r := &Runtime{flags: flags}
 	r.Init()
+	r.version = v
 	return r
 }
 
@@ -93,4 +95,11 @@ func (r *Runtime) Init() {
 	r.index.builtinShort = sharedIndex.builtinShort
 
 	r.loaded = map[*build.Instance]interface{}{}
+
+	cueexperiment.Init()
+	if cueexperiment.Flags.EvalV3 {
+		r.version = internal.DevVersion
+	} else {
+		r.version = internal.DefaultVersion
+	}
 }