internal/core/adt: add tests for 3639 and 3661

Issue #3669
Issue #3661
Issue #3678

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: I62c29888f28ff07181c820be1925f7e0d4dc5792
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1207236
Reviewed-by: Daniel Martí <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: mpvl

cue/testdata/builtins/validators.txtar

@@ -186,19 +186,45 @@ issue3474: topValidator: failType: {
 		if true {C: 1}
 	}
 }
+-- validator_is_top.cue --
+issue3639: {
+	a: {#X} & #X
+	a: b: 1
+	#X: matchN(1, [{b: int}])
+}
+issue3661: {
+	#X: matchN(1, [{ b!: int }])
+	a: b: 1
+	a: #X
+	["a"]: #X
+}
+issue3678: {
+	#X: matchN(1, [{
+		a!: string
+	}, {
+		c!: string
+	}])
 
+	x: c: "c"
+	
+	y: #X
+	y: x
+	x: #X
+}
 -- out/eval/stats --
-Leaks:  1
-Freed:  117
-Reused: 110
-Allocs: 8
-Retain: 12
+Leaks:  4
+Freed:  177
+Reused: 170
+Allocs: 11
+Retain: 23
 
-Unifications: 118
-Conjuncts:    226
-Disjuncts:    131
+Unifications: 181
+Conjuncts:    327
+Disjuncts:    202
 -- out/evalalpha --
 Errors:
+issue3639.a.b: field not allowed:
+    ./validator_is_top.cue:3:5
 callOfCallToValidator.e: cannot call previously called validator b:
     ./in.cue:94:5
 issue3418.t1: invalid value "foo" (does not satisfy matchN): conflicting values 2 and 1:
@@ -244,6 +270,12 @@ issue3474.topValidator.failType.A: invalid value {C:1} (does not satisfy matchN)
     ./issue3474.cue:53:5
     ./issue3474.cue:53:12
     ./issue3474.cue:54:5
+issue3661.a.b: field not allowed:
+    ./validator_is_top.cue:7:6
+    ./validator_is_top.cue:8:5
+issue3678.y.c: field not allowed:
+    ./validator_is_top.cue:13:6
+    ./validator_is_top.cue:19:5
 
 Result:
 (_|_){
@@ -457,12 +489,81 @@ Result:
       }
     }
   }
+  issue3639: (_|_){
+    // [eval]
+    a: (_|_){
+      // [eval] issue3639.a.b: field not allowed:
+      //     ./validator_is_top.cue:3:5
+      b: (_|_){
+        // [eval] issue3639.a.b: field not allowed:
+        //     ./validator_is_top.cue:3:5
+      }
+    }
+    #X: (_){ matchN(1, (#list){
+        0: (_|_){// &[{
+          //   b: int
+          // }]
+        }
+      }) }
+  }
+  issue3661: (_|_){
+    // [eval]
+    #X: (_){ matchN(1, (#list){
+        0: (_|_){// &[{
+          //   b!: int
+          // }]
+        }
+      }) }
+    a: (_|_){
+      // [eval] issue3661.a.b: field not allowed:
+      //     ./validator_is_top.cue:7:6
+      //     ./validator_is_top.cue:8:5
+      b: (_|_){
+        // [eval] issue3661.a.b: field not allowed:
+        //     ./validator_is_top.cue:7:6
+        //     ./validator_is_top.cue:8:5
+      }
+    }
+  }
+  issue3678: (_|_){
+    // [eval]
+    #X: (_){ matchN(1, (#list){
+        0: (_|_){// &[{
+          //   a!: string
+          // }]
+        }
+        1: (_|_){// &[{
+          //   c!: string
+          // }]
+        }
+      }) }
+    x: (#struct){
+      c: (string){ "c" }
+    }
+    y: (_|_){
+      // [eval] issue3678.y.c: field not allowed:
+      //     ./validator_is_top.cue:13:6
+      //     ./validator_is_top.cue:19:5
+      c: (_|_){
+        // [eval] issue3678.y.c: field not allowed:
+        //     ./validator_is_top.cue:13:6
+        //     ./validator_is_top.cue:19:5
+      }
+    }
+  }
 }
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
 --- old
 +++ new
-@@ -27,7 +27,7 @@
+@@ -1,4 +1,6 @@
+ Errors:
++issue3639.a.b: field not allowed:
++    ./validator_is_top.cue:3:5
+ callOfCallToValidator.e: cannot call previously called validator b:
+     ./in.cue:94:5
+ issue3418.t1: invalid value "foo" (does not satisfy matchN): conflicting values 2 and 1:
+@@ -27,7 +29,7 @@
      ./issue3418.cue:10:16
      ./issue3418.cue:10:18
      ./issue3418.cue:11:5
@@ -471,7 +572,20 @@ diff old new
      ./issue3474.cue:12:5
      ./issue3474.cue:12:22
      ./issue3474.cue:13:5
-@@ -134,11 +134,7 @@
+@@ -44,6 +46,12 @@
+     ./issue3474.cue:53:5
+     ./issue3474.cue:53:12
+     ./issue3474.cue:54:5
++issue3661.a.b: field not allowed:
++    ./validator_is_top.cue:7:6
++    ./validator_is_top.cue:8:5
++issue3678.y.c: field not allowed:
++    ./validator_is_top.cue:13:6
++    ./validator_is_top.cue:19:5
+ 
+ Result:
+ (_|_){
+@@ -134,11 +142,7 @@
          0: (int){ 1 }
        }
      }
@@ -484,7 +598,7 @@ diff old new
        _a: (_|_){
          // [incomplete] issue2098.incomplete1._a: invalid value [] (does not satisfy list.MinItems(1)): len(list) < MinItems(1) (0 < 1):
          //     ./in.cue:112:6
-@@ -202,7 +198,7 @@
+@@ -202,7 +206,7 @@
        failAfter: (_|_){
          // [eval]
          A: (_|_){
@@ -493,7 +607,7 @@ diff old new
            //     ./issue3474.cue:12:5
            //     ./issue3474.cue:12:22
            //     ./issue3474.cue:13:5
-@@ -245,7 +241,7 @@
+@@ -245,7 +249,7 @@
        }
        incomplete: (struct){
          A: (int){ &(matchN(1, (#list){
@@ -502,6 +616,107 @@ diff old new
              }
            }), int) }
        }
+@@ -261,44 +265,66 @@
+       }
+     }
+   }
+-  issue3639: (struct){
+-    a: (struct){
+-      b: (int){ 1 }
+-    }
+-    #X: (_){ matchN(1, (#list){
+-        0: (_|_){// {
++  issue3639: (_|_){
++    // [eval]
++    a: (_|_){
++      // [eval] issue3639.a.b: field not allowed:
++      //     ./validator_is_top.cue:3:5
++      b: (_|_){
++        // [eval] issue3639.a.b: field not allowed:
++        //     ./validator_is_top.cue:3:5
++      }
++    }
++    #X: (_){ matchN(1, (#list){
++        0: (_|_){// &[{
+           //   b: int
+-          // }
+-        }
+-      }) }
+-  }
+-  issue3661: (struct){
+-    #X: (_){ matchN(1, (#list){
+-        0: (_|_){// {
++          // }]
++        }
++      }) }
++  }
++  issue3661: (_|_){
++    // [eval]
++    #X: (_){ matchN(1, (#list){
++        0: (_|_){// &[{
+           //   b!: int
+-          // }
+-        }
+-      }) }
+-    a: (struct){
+-      b: (int){ 1 }
+-    }
+-  }
+-  issue3678: (struct){
+-    #X: (_){ matchN(1, (#list){
+-        0: (_|_){// {
++          // }]
++        }
++      }) }
++    a: (_|_){
++      // [eval] issue3661.a.b: field not allowed:
++      //     ./validator_is_top.cue:7:6
++      //     ./validator_is_top.cue:8:5
++      b: (_|_){
++        // [eval] issue3661.a.b: field not allowed:
++        //     ./validator_is_top.cue:7:6
++        //     ./validator_is_top.cue:8:5
++      }
++    }
++  }
++  issue3678: (_|_){
++    // [eval]
++    #X: (_){ matchN(1, (#list){
++        0: (_|_){// &[{
+           //   a!: string
+-          // }
+-        }
+-        1: (_|_){// {
++          // }]
++        }
++        1: (_|_){// &[{
+           //   c!: string
+-          // }
+-        }
+-      }) }
+-    x: (struct){
+-      c: (string){ "c" }
+-    }
+-    y: (struct){
+-      c: (string){ "c" }
++          // }]
++        }
++      }) }
++    x: (#struct){
++      c: (string){ "c" }
++    }
++    y: (_|_){
++      // [eval] issue3678.y.c: field not allowed:
++      //     ./validator_is_top.cue:13:6
++      //     ./validator_is_top.cue:19:5
++      c: (_|_){
++        // [eval] issue3678.y.c: field not allowed:
++        //     ./validator_is_top.cue:13:6
++        //     ./validator_is_top.cue:19:5
++      }
+     }
+   }
+ }
 -- out/eval --
 Errors:
 callOfCallToValidator.e: cannot call previously called validator b:
@@ -766,6 +981,46 @@ Result:
       }
     }
   }
+  issue3639: (struct){
+    a: (struct){
+      b: (int){ 1 }
+    }
+    #X: (_){ matchN(1, (#list){
+        0: (_|_){// {
+          //   b: int
+          // }
+        }
+      }) }
+  }
+  issue3661: (struct){
+    #X: (_){ matchN(1, (#list){
+        0: (_|_){// {
+          //   b!: int
+          // }
+        }
+      }) }
+    a: (struct){
+      b: (int){ 1 }
+    }
+  }
+  issue3678: (struct){
+    #X: (_){ matchN(1, (#list){
+        0: (_|_){// {
+          //   a!: string
+          // }
+        }
+        1: (_|_){// {
+          //   c!: string
+          // }
+        }
+      }) }
+    x: (struct){
+      c: (string){ "c" }
+    }
+    y: (struct){
+      c: (string){ "c" }
+    }
+  }
 }
 -- out/compile --
 --- in.cue
@@ -1016,3 +1271,47 @@ Result:
     }
   }
 }
+--- validator_is_top.cue
+{
+  issue3639: {
+    a: ({
+      〈1;#X〉
+    } & 〈0;#X〉)
+    a: {
+      b: 1
+    }
+    #X: matchN(1, [
+      {
+        b: int
+      },
+    ])
+  }
+  issue3661: {
+    #X: matchN(1, [
+      {
+        b!: int
+      },
+    ])
+    a: {
+      b: 1
+    }
+    a: 〈0;#X〉
+    ["a"]: 〈0;#X〉
+  }
+  issue3678: {
+    #X: matchN(1, [
+      {
+        a!: string
+      },
+      {
+        c!: string
+      },
+    ])
+    x: {
+      c: "c"
+    }
+    y: 〈0;#X〉
+    y: 〈0;x〉
+    x: 〈0;#X〉
+  }
+}