internal/core/adt: add indirection in some cases

When a previously registered node is involved
in an embedding, we always allocate a new
node and add the original node to the set.

Not doing so will means that an embedding group
will not be marked as excluded. This was
worked around with a hack in injectEmbedNode.
This has been removed.

This fixes exposed some issues in the API that
are addressed here as well to prevent
breakages.

We need to ensure that embeddings do not
open across conjuncts passed to Unify.

This mechanism makes the TopRef
mechanism redundant and this has
been removed as part of this change.

Fixes #3839
Fixes #3826

Signed-off-by: Marcel van Lohuizen <[email protected]>
Change-Id: If2b7ba647e2b7d0e99f906b08a7e76d3d2d7ba43
Reviewed-on: https://review.gerrithub.io/c/cue-lang/cue/+/1212144
Reviewed-by: Matthew Sackman <[email protected]>
TryBot-Result: CUEcueckoo <[email protected]>

Author: mpvl

cue/testdata/definitions/fields.txtar

@@ -342,12 +342,6 @@ embed.simple.a.err: field not allowed:
     ./in.cue:4:5
 embed.withIndirect.err: field not allowed:
     ./in.cue:71:8
-issue3839.full.out.ingress.bar: field not allowed:
-    ./issue3839.cue:27:4
-issue3839.full.out.ingress.foo: field not allowed:
-    ./issue3839.cue:26:4
-issue3839.reduced.x.y: field not allowed:
-    ./issue3839.cue:3:5
 embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
     ./validators.cue:21:5
     ./validators.cue:21:12
@@ -735,24 +729,17 @@ Result:
       }
     }
   }
-  issue3839: (_|_){
-    // [eval]
-    reduced: (_|_){
-      // [eval]
-      x: (_|_){
-        // [eval]
-        y: (_|_){
-          // [eval] issue3839.reduced.x.y: field not allowed:
-          //     ./issue3839.cue:3:5
-        }
+  issue3839: (struct){
+    reduced: (struct){
+      x: (#struct){
+        y: (int){ 1 }
       }
       #B: (#struct){
       }
       A: (#struct){
       }
     }
-    full: (_|_){
-      // [eval]
+    full: (struct){
       _globals: (struct){
         glb: (struct){
           globalField: (string){ "" }
@@ -765,21 +752,13 @@ Result:
         glb: ~(issue3839.full.#GlobalContext)
         out: ~(issue3839.full.#GlobalContext)
       }
-      out: (_|_){
-        // [eval]
-        ingress: (_|_){
-          // [eval]
+      out: (struct){
+        ingress: (#struct){
           #def: (#struct){
             globalField: (string){ "" }
           }
-          foo: (_|_){
-            // [eval] issue3839.full.out.ingress.foo: field not allowed:
-            //     ./issue3839.cue:26:4
-          }
-          bar: (_|_){
-            // [eval] issue3839.full.out.ingress.bar: field not allowed:
-            //     ./issue3839.cue:27:4
-          }
+          foo: (int){ 1234 }
+          bar: (string){ "http" }
         }
       }
       #Embed: (#struct){
@@ -1010,7 +989,7 @@ Result:
 diff old new
 --- old
 +++ new
-@@ -1,81 +1,35 @@
+@@ -1,81 +1,29 @@
  Errors:
  and.transitive.out.ok: field not allowed:
 -    ./in.cue:34:5
@@ -1089,16 +1068,10 @@ diff old new
 -    ./validators.cue:12:6
 -    ./validators.cue:17:5
 -    ./validators.cue:18:5
-+issue3839.full.out.ingress.bar: field not allowed:
-+    ./issue3839.cue:27:4
-+issue3839.full.out.ingress.foo: field not allowed:
-+    ./issue3839.cue:26:4
-+issue3839.reduced.x.y: field not allowed:
-+    ./issue3839.cue:3:5
  embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
      ./validators.cue:21:5
      ./validators.cue:21:12
-@@ -94,14 +48,11 @@
+@@ -94,14 +42,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1114,7 +1087,7 @@ diff old new
        }
      }
      andInStruct: (_|_){
-@@ -111,14 +62,11 @@
+@@ -111,14 +56,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1130,7 +1103,7 @@ diff old new
        }
      }
      embedDefWithEmbedding: (_|_){
-@@ -128,15 +76,11 @@
+@@ -128,15 +70,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1147,7 +1120,7 @@ diff old new
        }
      }
      embedComprehension: (_|_){
-@@ -146,16 +90,11 @@
+@@ -146,16 +84,11 @@
        }
        a: (_|_){
          // [eval]
@@ -1165,7 +1138,7 @@ diff old new
        }
      }
      fieldWithAnd: (_|_){
-@@ -166,9 +105,6 @@
+@@ -166,9 +99,6 @@
          // [eval]
          err: (_|_){
            // [eval] embed.fieldWithAnd.a.err: field not allowed:
@@ -1175,7 +1148,7 @@ diff old new
            //     ./in.cue:20:13
          }
        }
-@@ -179,20 +115,15 @@
+@@ -179,20 +109,15 @@
          a: (int){ int }
        }
        B: (struct){
@@ -1201,7 +1174,7 @@ diff old new
        }
      }
      andEmbed: (_|_){
-@@ -208,17 +139,11 @@
+@@ -208,17 +133,11 @@
        }
        d: (_|_){
          // [eval]
@@ -1220,7 +1193,7 @@ diff old new
        }
      }
      nonDef: (struct){
-@@ -227,12 +152,12 @@
+@@ -227,12 +146,12 @@
            a: (string){ string }
          }
          #Y: (#struct){
@@ -1237,7 +1210,7 @@ diff old new
          }
        }
      }
-@@ -242,12 +167,12 @@
+@@ -242,12 +161,12 @@
            Name: (string){ string }
          }
          #Step: (#struct){
@@ -1254,7 +1227,7 @@ diff old new
          }
          out: (#struct){
            Name: (string){ "foo" }
-@@ -257,21 +182,15 @@
+@@ -257,21 +176,15 @@
      }
      withIndirect: (_|_){
        // [eval]
@@ -1281,7 +1254,7 @@ diff old new
      }
      normalValidator: (_|_){
        // [eval]
-@@ -281,20 +200,17 @@
+@@ -281,20 +194,17 @@
        }
        x: (_|_){
          // [eval]
@@ -1305,7 +1278,7 @@ diff old new
          #X: (_){
            matchN(0, (#list){
            })
-@@ -301,17 +217,10 @@
+@@ -301,17 +211,10 @@
            a?: (int){ int }
            b?: (int){ int }
          }
@@ -1327,7 +1300,7 @@ diff old new
          }
        }
        t2: (_|_){
-@@ -330,10 +239,7 @@
+@@ -330,10 +233,7 @@
            // [eval]
            b: (_|_){
              // [eval] embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct):
@@ -1338,7 +1311,7 @@ diff old new
              //     ./validators.cue:24:8
              // embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
              //     ./validators.cue:21:5
-@@ -360,16 +266,11 @@
+@@ -360,16 +260,11 @@
        }
        out: (_|_){
          // [eval]
@@ -1356,7 +1329,7 @@ diff old new
        }
      }
      transitiveWithEmbed: (_|_){
-@@ -385,17 +286,11 @@
+@@ -385,17 +280,11 @@
        }
        out: (_|_){
          // [eval]
@@ -1375,7 +1348,7 @@ diff old new
        }
      }
    }
-@@ -414,8 +309,8 @@
+@@ -414,8 +303,8 @@
              //     ./issue3832.cue:8:16
            }
            outFirstName: (_|_){
@@ -1386,7 +1359,7 @@ diff old new
            }
          }
        }
-@@ -425,35 +320,27 @@
+@@ -425,35 +314,27 @@
          }, (#struct){
            pass: (#struct){
              let self#1 = (_|_){
@@ -1432,7 +1405,7 @@ diff old new
        pass: (#struct){
          let self#1 = (#struct){
            firstName: (string){ "Sam" }
-@@ -460,18 +347,21 @@
+@@ -460,18 +341,21 @@
          }
          outFirstName: (string){ "Sam" }
        }
@@ -1466,43 +1439,7 @@ diff old new
    }
    issue3833: (struct){
      out: (#struct){
-@@ -527,17 +417,24 @@
-       }
-     }
-   }
--  issue3839: (struct){
--    reduced: (struct){
--      x: (#struct){
--        y: (int){ 1 }
--      }
--      #B: (#struct){
--      }
--      A: (#struct){
--      }
--    }
--    full: (struct){
-+  issue3839: (_|_){
-+    // [eval]
-+    reduced: (_|_){
-+      // [eval]
-+      x: (_|_){
-+        // [eval]
-+        y: (_|_){
-+          // [eval] issue3839.reduced.x.y: field not allowed:
-+          //     ./issue3839.cue:3:5
-+        }
-+      }
-+      #B: (#struct){
-+      }
-+      A: (#struct){
-+      }
-+    }
-+    full: (_|_){
-+      // [eval]
-       _globals: (struct){
-         glb: (struct){
-           globalField: (string){ "" }
-@@ -547,20 +444,24 @@
+@@ -547,12 +431,8 @@
          globalField: (string){ string }
        }
        #Context: (#struct){
@@ -1512,33 +1449,12 @@ diff old new
 -        out: (#struct){
 -          globalField: (string){ string }
 -        }
--      }
--      out: (struct){
--        ingress: (#struct){
 +        glb: ~(issue3839.full.#GlobalContext)
 +        out: ~(issue3839.full.#GlobalContext)
-+      }
-+      out: (_|_){
-+        // [eval]
-+        ingress: (_|_){
-+          // [eval]
-           #def: (#struct){
-             globalField: (string){ "" }
-           }
--          foo: (int){ 1234 }
--          bar: (string){ "http" }
-+          foo: (_|_){
-+            // [eval] issue3839.full.out.ingress.foo: field not allowed:
-+            //     ./issue3839.cue:26:4
-+          }
-+          bar: (_|_){
-+            // [eval] issue3839.full.out.ingress.bar: field not allowed:
-+            //     ./issue3839.cue:27:4
-+          }
-         }
        }
-       #Embed: (#struct){
-@@ -580,22 +481,22 @@
+       out: (struct){
+         ingress: (#struct){
+@@ -580,22 +460,22 @@
            #Z: (#struct){
            }
            x: (#struct){
@@ -1577,7 +1493,7 @@ diff old new
              z: (int){ 1 }
            }
          }
-@@ -605,22 +506,22 @@
+@@ -605,22 +485,22 @@
            #Z: (#struct){
            }
            x: (#struct){
@@ -1616,7 +1532,7 @@ diff old new
              z: (int){ 1 }
            }
          }
-@@ -675,38 +576,11 @@
+@@ -675,38 +555,11 @@
      #Main: (#struct){
        namespace: (string){ string }
        output: (_|_){
@@ -1657,7 +1573,7 @@ diff old new
          let base#6 = (#struct){
            someMsg: (string){ string }
            obs: (#struct){ |(*(#struct){
-@@ -749,6 +623,19 @@
+@@ -749,6 +602,19 @@
              }
            }
          }
@@ -1677,7 +1593,7 @@ diff old new
        }
      }
      out: (#struct){
-@@ -768,7 +655,9 @@
+@@ -768,7 +634,9 @@
          }
          out: (#struct){
            b1: (_|_){
@@ -1688,7 +1604,7 @@ diff old new
              // disjunction.withErr.t1.out.b1: conflicting values null and {b2:{b3:params.mayExistLater}} (mismatched types null and struct):
              //     ./validators.cue:29:7
              //     ./validators.cue:31:17
-@@ -778,17 +667,8 @@
+@@ -778,17 +646,8 @@
              //     ./validators.cue:32:17
              // disjunction.withErr.t1.out.b1.b2.b3: undefined field: mayExistLater:
              //     ./validators.cue:29:22