internal/core/adt: reset embedding scopes for subfields

Embedding scopes should not be carried over
to subfields. This changes resets them.

The change to bulk.txtar seems to be an improvement.

Fixes #3834
Fixes #3837

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

Author: mpvl

cue/testdata/definitions/issue3834.txtar

@@ -121,27 +121,15 @@ Disjuncts:    237
         concrete: (struct){
         }
       }
-      _a: (struct){ |((struct){
-          foo: (bool){ true }
-        }, (#struct){
-          foo: (bool){ true }
-          y!: (struct){
-            z?: (_){ _ }
-          }
-        }) }
-      _b: (struct){ |((struct){
-          y: (struct){
-          }
-          foo: (bool){ true }
-        }, (#struct){
-          y: (struct){
-            z?: (_){ _ }
-          }
-          foo: (bool){ true }
-        }) }
-      concrete: (_|_){
-        // [incomplete] sub.t2.concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
-        //     ./in.cue:25:13
+      _a: (struct){
+        foo: (bool){ true }
+      }
+      _b: (struct){
+        y: (struct){
+        }
+        foo: (bool){ true }
+      }
+      concrete: (struct){
       }
     }
     t3: (#struct){
@@ -181,27 +169,15 @@ Disjuncts:    237
         concrete: (#struct){
         }
       }
-      _a: (#struct){ |((#struct){
-          foo: (bool){ true }
-        }, (#struct){
-          foo: (bool){ true }
-          y!: (#struct){
-            z?: (_){ _ }
-          }
-        }) }
-      _b: (#struct){ |((#struct){
-          y: (#struct){
-          }
-          foo: (bool){ true }
-        }, (#struct){
-          y: (#struct){
-            z?: (_){ _ }
-          }
-          foo: (bool){ true }
-        }) }
-      concrete: (_|_){
-        // [incomplete] sub.t4.concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
-        //     ./in.cue:43:13
+      _a: (#struct){
+        foo: (bool){ true }
+      }
+      _b: (#struct){
+        y: (#struct){
+        }
+        foo: (bool){ true }
+      }
+      concrete: (#struct){
       }
     }
   }
@@ -227,29 +203,17 @@ Disjuncts:    237
     }
     out: (bool){ true }
   }
-  _a: (struct){ |((struct){
-      foo: (bool){ true }
-    }, (#struct){
-      foo: (bool){ true }
-      y!: (struct){
-        z?: (_){ _ }
-      }
-    }) }
-  _b: (struct){ |((struct){
-      y: (struct){
-      }
-      foo: (bool){ true }
-    }, (#struct){
-      y: (struct){
-        z?: (_){ _ }
-      }
-      foo: (bool){ true }
-    }) }
-  concrete: (_|_){
-    // [incomplete] concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
-    //     ./in.cue:6:12
+  _a: (struct){
+    foo: (bool){ true }
+  }
+  _b: (struct){
+    y: (struct){
+    }
+    foo: (bool){ true }
+  }
+  concrete: (struct){
   }
-  isTrue: (bool){ false }
+  isTrue: (bool){ true }
 }
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
@@ -260,10 +224,8 @@ diff old new
      }
      _b: (struct){
 -      foo: (bool){ true }
--      y: (struct){
--      }
-+      y: (struct){
-+      }
+       y: (struct){
+       }
 +      foo: (bool){ true }
      }
      concrete: (struct){
@@ -319,7 +281,7 @@ diff old new
        }
        concrete: (struct){
        }
-@@ -54,22 +43,34 @@
+@@ -54,20 +43,20 @@
            foo: (bool){ true }
          }
          _b: (struct){
@@ -337,40 +299,24 @@ diff old new
 -        foo: (bool){ true }
 -        y: (struct){
 -        }
--      }
--      concrete: (struct){
 +          y: (struct){
 +          }
 +          foo: (bool){ true }
 +        }
 +        concrete: (struct){
 +        }
 +      }
-+      _a: (struct){ |((struct){
-+          foo: (bool){ true }
-+        }, (#struct){
-+          foo: (bool){ true }
-+          y!: (struct){
-+            z?: (_){ _ }
-+          }
-+        }) }
-+      _b: (struct){ |((struct){
-+          y: (struct){
-+          }
-+          foo: (bool){ true }
-+        }, (#struct){
-+          y: (struct){
-+            z?: (_){ _ }
-+          }
-+          foo: (bool){ true }
-+        }) }
-+      concrete: (_|_){
-+        // [incomplete] sub.t2.concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
-+        //     ./in.cue:25:13
++      _a: (struct){
++        foo: (bool){ true }
++      }
++      _b: (struct){
++        y: (struct){
++        }
++        foo: (bool){ true }
        }
-     }
-     t3: (#struct){
-@@ -78,20 +79,20 @@
+       concrete: (struct){
+       }
+@@ -78,20 +67,20 @@
            foo: (bool){ true }
          }
          _b: (#struct){
@@ -405,7 +351,7 @@ diff old new
        }
        concrete: (#struct){
        }
-@@ -102,22 +103,34 @@
+@@ -102,20 +91,20 @@
            foo: (bool){ true }
          }
          _b: (#struct){
@@ -423,40 +369,24 @@ diff old new
 -        foo: (bool){ true }
 -        y: (#struct){
 -        }
--      }
--      concrete: (#struct){
 +          y: (#struct){
 +          }
 +          foo: (bool){ true }
 +        }
 +        concrete: (#struct){
 +        }
 +      }
-+      _a: (#struct){ |((#struct){
-+          foo: (bool){ true }
-+        }, (#struct){
-+          foo: (bool){ true }
-+          y!: (#struct){
-+            z?: (_){ _ }
-+          }
-+        }) }
-+      _b: (#struct){ |((#struct){
-+          y: (#struct){
-+          }
-+          foo: (bool){ true }
-+        }, (#struct){
-+          y: (#struct){
-+            z?: (_){ _ }
-+          }
-+          foo: (bool){ true }
-+        }) }
-+      concrete: (_|_){
-+        // [incomplete] sub.t4.concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
-+        //     ./in.cue:43:13
++      _a: (#struct){
++        foo: (bool){ true }
++      }
++      _b: (#struct){
++        y: (#struct){
++        }
++        foo: (bool){ true }
        }
-     }
-   }
-@@ -127,9 +140,9 @@
+       concrete: (#struct){
+       }
+@@ -127,9 +116,9 @@
          Foo: (bool){ true }
        }
        _dataWithExtra: (#struct){
@@ -467,7 +397,7 @@ diff old new
        }
        out: (bool){ true }
      }
-@@ -137,10 +150,33 @@
+@@ -137,10 +126,21 @@
        Foo: (bool){ true }
      }
      _dataWithExtra: (#struct){
@@ -478,32 +408,18 @@ diff old new
      }
      out: (bool){ true }
    }
-+  _a: (struct){ |((struct){
-+      foo: (bool){ true }
-+    }, (#struct){
-+      foo: (bool){ true }
-+      y!: (struct){
-+        z?: (_){ _ }
-+      }
-+    }) }
-+  _b: (struct){ |((struct){
-+      y: (struct){
-+      }
-+      foo: (bool){ true }
-+    }, (#struct){
-+      y: (struct){
-+        z?: (_){ _ }
-+      }
-+      foo: (bool){ true }
-+    }) }
-+  concrete: (_|_){
-+    // [incomplete] concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
-+    //     ./in.cue:6:12
++  _a: (struct){
++    foo: (bool){ true }
++  }
++  _b: (struct){
++    y: (struct){
++    }
++    foo: (bool){ true }
++  }
++  concrete: (struct){
 +  }
-+  isTrue: (bool){ false }
++  isTrue: (bool){ true }
  }
--- diff/todo/p1 --
-*.concrete: several fields where there is still an disjunction
 -- out/eval --
 (struct){
   X: (struct){