internal/core/eval: ... does not apply to defintions

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

Author: mpvl

cue/testdata/definitions/issue539.txtar

@@ -0,0 +1,45 @@
+-- in.cue --
+#Schema: {
+	...
+}
+
+Component: {
+	hostname: string | *"localhost"
+
+	#foo: {
+		hello: "world"
+	}
+}
+
+hello: #Schema & Component
+-- out/eval --
+(struct){
+  #Schema: (#struct){
+  }
+  Component: (struct){
+    hostname: (string){ |(*(string){ "localhost" }, (string){ string }) }
+    #foo: (#struct){
+      hello: (string){ "world" }
+    }
+  }
+  hello: (#struct){
+    hostname: (string){ |(*(string){ "localhost" }, (string){ string }) }
+    #foo: (#struct){
+      hello: (string){ "world" }
+    }
+  }
+}
+-- out/compile --
+--- in.cue
+{
+  #Schema: {
+    ...
+  }
+  Component: {
+    hostname: (string|*"localhost")
+    #foo: {
+      hello: "world"
+    }
+  }
+  hello: (〈0;#Schema〉 & 〈0;Component〉)
+}

internal/core/eval/closed.go

@@ -483,8 +483,8 @@ func (c *acceptor) verifySets(ctx *adt.OpContext, id adt.ID, f adt.Feature) (fou
 	if o == nil {
 		return false, false
 	}
-	for ; o != nil; o = o.next {
-		if len(o.additional) > 0 || o.isOpen {
+	for isRegular := f.IsRegular(); o != nil; o = o.next {
+		if isRegular && (len(o.additional) > 0 || o.isOpen) {
 			return true, false
 		}
 
@@ -494,6 +494,10 @@ func (c *acceptor) verifySets(ctx *adt.OpContext, id adt.ID, f adt.Feature) (fou
 			}
 		}
 
+		if !isRegular {
+			continue
+		}
+
 		for _, b := range o.bulk {
 			if b.check.Match(ctx, f) {
 				return true, false