internal/core/eval: fix closedness issue for lists

closedness updates were previously incorrectly skipped.

Note that list acceptance checks are checked elsewhere
and should be skipped.

Fixes #595

Change-Id: I962bef093fa8623724e9c45105aedd184ed20a8b
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/7785
Reviewed-by: CUE cueckoo <[email protected]>
Reviewed-by: Marcel van Lohuizen <[email protected]>

Author: mpvl

cue/testdata/definitions/comprehensions.txtar

@@ -0,0 +1,46 @@
+-- in.cue --
+issue595: {
+    // NOTE: this should eval with an EVAL error, not
+    // an incomplete error. See Issue #595.
+    #cfgs: [{
+        name: "foo"
+    }]
+    for cfg in #cfgs {
+        files: cfg.nam
+    }
+}
+-- out/eval --
+Errors:
+issue595.files: undefined field nam:
+    ./in.cue:8:20
+
+Result:
+(_|_){
+  // [eval]
+  issue595: (_|_){
+    // [eval]
+    #cfgs: (#list){
+      0: (#struct){
+        name: (string){ "foo" }
+      }
+    }
+    files: (_|_){
+      // [eval] issue595.files: undefined field nam:
+      //     ./in.cue:8:20
+    }
+  }
+}
+-- out/compile --
+--- in.cue
+{
+  issue595: {
+    #cfgs: [
+      {
+        name: "foo"
+      },
+    ]
+    for _, cfg in 〈0;#cfgs〉 {
+      files: 〈1;cfg〉.nam
+    }
+  }
+}

internal/core/eval/eval.go

@@ -639,10 +639,6 @@ func (n *nodeContext) updateClosedInfo() {
 		// later. Logically we're done.
 	}
 
-	if n.node.IsList() {
-		return
-	}
-
 	a, _ := n.node.Closed.(*acceptor)
 	if a == nil {
 		if !n.node.IsList() && !n.needClose {
@@ -660,7 +656,9 @@ func (n *nodeContext) updateClosedInfo() {
 	// for Value.Unify (API).
 	ctx := n.ctx
 
-	if accept := n.nodeShared.accept; accept != nil {
+	// TODO: record the list length for the acceptor, possibly. But the
+	// length matching should already have been done.
+	if accept := n.nodeShared.accept; accept != nil && !n.node.IsList() {
 		for _, a := range n.node.Arcs {
 			if !accept.Accept(n.ctx, a.Label) {
 				label := a.Label.SelectorString(ctx)

tools/trim/testdata/listaccept.txtar

@@ -0,0 +1,21 @@
+-- in.cue --
+deployment: [ID=_]: {
+	containers: [{}]
+}
+
+deployment: bartender: {
+	containers: [{
+		image: "gcr.io/myproj/bartender:v0.1.34"
+	}]
+}
+-- out/trim --
+== in.cue
+deployment: [ID=_]: {
+	containers: [{}]
+}
+
+deployment: bartender: {
+	containers: [{
+		image: "gcr.io/myproj/bartender:v0.1.34"
+	}]
+}

tools/trim/trim_test.go

@@ -326,7 +326,9 @@ func TestX(t *testing.T) {
 
 	files := instances[0].Files
 
-	err := Files(files, inst, &Config{Trace: false})
+	err := Files(files, inst, &Config{
+		Trace: true,
+	})
 	if err != nil {
 		t.Fatal(err)
 	}