internal/core/adt: apply replacements from ancestors

Replacements from ancestors should be
applied as well. Not doing so resulted in
the breakage of 3833.

Note that this regresses one test in 3834.
This is not the test that was reported
originally in the issue, as that was at the top
level. Still, the issue is eitherway still open
as not all cases were covered.

Also note that this is a slow implementation.
I tried a caching implementation, but this
resulted in a lot of changes, so this seems
safer, albeit slightly slower.

Fixes #3833

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

Author: mpvl

cue/testdata/definitions/issue3834.txtar

@@ -227,17 +227,29 @@ Disjuncts:    237
     }
     out: (bool){ true }
   }
-  _a: (struct){
-    foo: (bool){ true }
-  }
-  _b: (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] concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
+    //     ./in.cue:6:12
   }
-  isTrue: (bool){ true }
+  isTrue: (bool){ false }
 }
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
@@ -248,8 +260,10 @@ diff old new
      }
      _b: (struct){
 -      foo: (bool){ true }
-       y: (struct){
-       }
+-      y: (struct){
+-      }
++      y: (struct){
++      }
 +      foo: (bool){ true }
      }
      concrete: (struct){
@@ -453,7 +467,7 @@ diff old new
        }
        out: (bool){ true }
      }
-@@ -137,10 +150,21 @@
+@@ -137,10 +150,33 @@
        Foo: (bool){ true }
      }
      _dataWithExtra: (#struct){
@@ -464,17 +478,29 @@ diff old new
      }
      out: (bool){ true }
    }
-+  _a: (struct){
-+    foo: (bool){ true }
-+  }
-+  _b: (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] concrete: unresolved disjunction {y:{},foo:true} | {y:{z?:_},foo:true} (type struct):
++    //     ./in.cue:6:12
 +  }
-+  isTrue: (bool){ true }
++  isTrue: (bool){ false }
  }
 -- diff/todo/p1 --
 *.concrete: several fields where there is still an disjunction

cue/testdata/definitions/typocheck.txtar

@@ -261,9 +261,6 @@ embed.simple.a.err: field not allowed:
     ./in.cue:4:5
 embed.withIndirect.err: field not allowed:
     ./in.cue:71:8
-issue3833.out.a.b: field not allowed:
-    ./issue3833.cue:4:6
-    ./issue3833.cue:10:3
 embed.openValidator.t2.a.b: invalid value 1 (does not satisfy matchN): 0 matched, expected 1:
     ./validators.cue:21:5
     ./validators.cue:21:12
@@ -597,17 +594,10 @@ Result:
     }
     results: ~(issue3832._assert.pass)
   }
-  issue3833: (_|_){
-    // [eval]
-    out: (_|_){
-      // [eval]
-      a: (_|_){
-        // [eval]
-        b: (_|_){
-          // [eval] issue3833.out.a.b: field not allowed:
-          //     ./issue3833.cue:4:6
-          //     ./issue3833.cue:10:3
-        }
+  issue3833: (struct){
+    out: (#struct){
+      a: (#struct){
+        b: (string){ "foo" }
         c: (string){ "foo" }
       }
     }
@@ -788,7 +778,7 @@ Result:
 diff old new
 --- old
 +++ new
-@@ -1,81 +1,32 @@
+@@ -1,81 +1,29 @@
  Errors:
  and.transitive.out.ok: field not allowed:
 -    ./in.cue:34:5
@@ -867,13 +857,10 @@ diff old new
 -    ./validators.cue:12:6
 -    ./validators.cue:17:5
 -    ./validators.cue:18:5
-+issue3833.out.a.b: field not allowed:
-+    ./issue3833.cue:4:6
-+    ./issue3833.cue:10:3
  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 +45,11 @@
+@@ -94,14 +42,11 @@
        }
        a: (_|_){
          // [eval]
@@ -889,7 +876,7 @@ diff old new
        }
      }
      andInStruct: (_|_){
-@@ -111,14 +59,11 @@
+@@ -111,14 +56,11 @@
        }
        a: (_|_){
          // [eval]
@@ -905,7 +892,7 @@ diff old new
        }
      }
      embedDefWithEmbedding: (_|_){
-@@ -128,15 +73,11 @@
+@@ -128,15 +70,11 @@
        }
        a: (_|_){
          // [eval]
@@ -922,7 +909,7 @@ diff old new
        }
      }
      embedComprehension: (_|_){
-@@ -146,16 +87,11 @@
+@@ -146,16 +84,11 @@
        }
        a: (_|_){
          // [eval]
@@ -940,7 +927,7 @@ diff old new
        }
      }
      fieldWithAnd: (_|_){
-@@ -166,9 +102,6 @@
+@@ -166,9 +99,6 @@
          // [eval]
          err: (_|_){
            // [eval] embed.fieldWithAnd.a.err: field not allowed:
@@ -950,7 +937,7 @@ diff old new
            //     ./in.cue:20:13
          }
        }
-@@ -179,20 +112,15 @@
+@@ -179,20 +109,15 @@
          a: (int){ int }
        }
        B: (struct){
@@ -976,7 +963,7 @@ diff old new
        }
      }
      andEmbed: (_|_){
-@@ -208,17 +136,11 @@
+@@ -208,17 +133,11 @@
        }
        d: (_|_){
          // [eval]
@@ -995,7 +982,7 @@ diff old new
        }
      }
      nonDef: (struct){
-@@ -227,12 +149,12 @@
+@@ -227,12 +146,12 @@
            a: (string){ string }
          }
          #Y: (#struct){
@@ -1012,7 +999,7 @@ diff old new
          }
        }
      }
-@@ -242,12 +164,12 @@
+@@ -242,12 +161,12 @@
            Name: (string){ string }
          }
          #Step: (#struct){
@@ -1029,7 +1016,7 @@ diff old new
          }
          out: (#struct){
            Name: (string){ "foo" }
-@@ -257,21 +179,15 @@
+@@ -257,21 +176,15 @@
      }
      withIndirect: (_|_){
        // [eval]
@@ -1056,7 +1043,7 @@ diff old new
      }
      normalValidator: (_|_){
        // [eval]
-@@ -281,20 +197,17 @@
+@@ -281,20 +194,17 @@
        }
        x: (_|_){
          // [eval]
@@ -1080,7 +1067,7 @@ diff old new
          #X: (_){
            matchN(0, (#list){
            })
-@@ -301,17 +214,10 @@
+@@ -301,17 +211,10 @@
            a?: (int){ int }
            b?: (int){ int }
          }
@@ -1102,7 +1089,7 @@ diff old new
          }
        }
        t2: (_|_){
-@@ -330,10 +236,7 @@
+@@ -330,10 +233,7 @@
            // [eval]
            b: (_|_){
              // [eval] embed.openValidator.t2.a.b: conflicting values 1 and {b?:Y} (mismatched types int and struct):
@@ -1113,7 +1100,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 +263,11 @@
+@@ -360,16 +260,11 @@
        }
        out: (_|_){
          // [eval]
@@ -1131,7 +1118,7 @@ diff old new
        }
      }
      transitiveWithEmbed: (_|_){
-@@ -385,17 +283,11 @@
+@@ -385,17 +280,11 @@
        }
        out: (_|_){
          // [eval]
@@ -1150,7 +1137,7 @@ diff old new
        }
      }
    }
-@@ -414,8 +306,8 @@
+@@ -414,8 +303,8 @@
              //     ./issue3832.cue:8:16
            }
            outFirstName: (_|_){
@@ -1161,7 +1148,7 @@ diff old new
            }
          }
        }
-@@ -425,21 +317,34 @@
+@@ -425,21 +314,34 @@
          }, (#struct){
            pass: (#struct){
              let self#1 = (_|_){
@@ -1201,7 +1188,7 @@ diff old new
      _subject: (#struct){
        in: (_){ _ }
        out: (#struct){
-@@ -448,35 +353,24 @@
+@@ -448,30 +350,12 @@
            //     ./issue3832.cue:8:16
          }
          outFirstName: (_|_){
@@ -1229,33 +1216,16 @@ diff old new
 -      }
 -      outFirstName: (string){ "Sam" }
 -    }
--  }
--  issue3833: (struct){
--    out: (#struct){
--      a: (#struct){
--        b: (string){ "foo" }
 +          // [incomplete] issue3832._subject.out.outFirstName: undefined field: firstName:
 +          //     ./issue3832.cue:9:24
 +        }
 +      }
 +    }
 +    results: ~(issue3832._assert.pass)
-+  }
-+  issue3833: (_|_){
-+    // [eval]
-+    out: (_|_){
-+      // [eval]
-+      a: (_|_){
-+        // [eval]
-+        b: (_|_){
-+          // [eval] issue3833.out.a.b: field not allowed:
-+          //     ./issue3833.cue:4:6
-+          //     ./issue3833.cue:10:3
-+        }
-         c: (string){ "foo" }
-       }
-     }
-@@ -541,38 +435,11 @@
+   }
+   issue3833: (struct){
+     out: (#struct){
+@@ -541,38 +425,11 @@
      #Main: (#struct){
        namespace: (string){ string }
        output: (_|_){
@@ -1296,7 +1266,7 @@ diff old new
          let base#6 = (#struct){
            someMsg: (string){ string }
            obs: (#struct){ |(*(#struct){
-@@ -615,6 +482,19 @@
+@@ -615,6 +472,19 @@
              }
            }
          }
@@ -1316,7 +1286,7 @@ diff old new
        }
      }
      out: (#struct){
-@@ -634,7 +514,9 @@
+@@ -634,7 +504,9 @@
          }
          out: (#struct){
            b1: (_|_){
@@ -1327,7 +1297,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
-@@ -644,17 +526,8 @@
+@@ -644,17 +516,8 @@
              //     ./validators.cue:32:17
              // disjunction.withErr.t1.out.b1.b2.b3: undefined field: mayExistLater:
              //     ./validators.cue:29:22
@@ -1349,7 +1319,6 @@ diff old new
          }
 -- diff/todo/p1 --
 embed.openValidator.t1.err: unexpected pass.
-issue3833.out.a.b: field should be alloweds
 -- diff/todo/p2 --
 and.transitive(WithEmbed)?.out.ok: unexpected error
 -- out/eval --