internal/core/adt: remove Inline check

Now we simulate inline fields as being real
fields, we can remove the inline check and
treat them more permissively.

Note that this also makes some inline calls
more permissive, resulting in some nicer
outcomes.

Fixes #3634

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

Author: mpvl

cue/testdata/cycle/builtins.txtar

@@ -255,15 +255,15 @@ issue3634: reduced: {
 	out: len(#D & list.Repeat([#D & { a: b: 1 }], 1)[0])
 }
 -- out/evalalpha/stats --
-Leaks:  465
+Leaks:  484
 Freed:  0
 Reused: 0
-Allocs: 465
+Allocs: 484
 Retain: 0
 
-Unifications: 397
-Conjuncts:    868
-Disjuncts:    34
+Unifications: 409
+Conjuncts:    920
+Disjuncts:    38
 -- diff/-out/evalalpha/stats<==>+out/eval/stats --
 diff old new
 --- old
@@ -274,18 +274,18 @@ diff old new
 -Reused: 434
 -Allocs: 37
 -Retain: 99
-+Leaks:  465
++Leaks:  484
 +Freed:  0
 +Reused: 0
-+Allocs: 465
++Allocs: 484
 +Retain: 0
 
 -Unifications: 441
 -Conjuncts:    821
 -Disjuncts:    537
-+Unifications: 397
-+Conjuncts:    868
-+Disjuncts:    34
++Unifications: 409
++Conjuncts:    920
++Disjuncts:    38
 -- out/eval/stats --
 Leaks:  25
 Freed:  446
@@ -298,11 +298,6 @@ Conjuncts:    821
 Disjuncts:    537
 -- out/evalalpha --
 Errors:
-0.properties.foo: cannot combine regular field "required" with null:
-    ./issue3634.cue:6:26
-0.properties.foo: conflicting values null and {required:["bar","baz"]} (mismatched types null and struct):
-    ./issue3634.cue:6:26
-    ./issue3634.cue:11:20
 noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1:
     ./cycle.cue:4:7
     ./cycle.cue:4:14
@@ -319,12 +314,6 @@ issue3649.cycle.t1.data.a: invalid value {b:"foo"} (does not satisfy matchN): 0
     ./cycle.cue:31:13
 issue3649.cycle.t1.data.a.a: structural cycle:
     ./cycle.cue:31:6
-0.properties.foo: structural cycle:
-    ./issue3634.cue:6:33
-0.properties.foo: 3 errors in empty disjunction::
-    ./issue3634.cue:9:26
-0.a: structural cycle:
-    ./issue3634.cue:17:7
 jsonCycle.t1.x.y: invalid value "{}" (does not satisfy encoding/json.Validate): error in call to encoding/json.Validate: structural cycle:
     ./jsoncycle.cue:4:8
     ./jsoncycle.cue:5:8
@@ -543,40 +532,24 @@ Result:
       host: (string){ "mod.test" }
     }
   }
-  issue3634: (_|_){
-    // [structural cycle]
-    full: (_|_){
-      // [structural cycle]
+  issue3634: (struct){
+    full: (struct){
       #Schema: (#struct){
         required?: (list){
         }
         properties?: (#struct){
         }
       }
-      out: (_|_){
-        // [structural cycle] 0.properties.foo: cannot combine regular field "required" with null:
-        //     ./issue3634.cue:6:26
-        // 0.properties.foo: conflicting values null and {required:["bar","baz"]} (mismatched types null and struct):
-        //     ./issue3634.cue:6:26
-        //     ./issue3634.cue:11:20
-        // 0.properties.foo: structural cycle:
-        //     ./issue3634.cue:6:33
-        // 0.properties.foo: 3 errors in empty disjunction::
-        //     ./issue3634.cue:9:26
-      }
+      out: (int){ 3 }
     }
-    reduced: (_|_){
-      // [structural cycle]
+    reduced: (struct){
       #D: (#struct){
         b?: (int){ int }
         a?: (_|_){
           // [structural cycle] issue3634.reduced.#D.a: structural cycle
         }
       }
-      out: (_|_){
-        // [structural cycle] 0.a: structural cycle:
-        //     ./issue3634.cue:17:7
-      }
+      out: (int){ 1 }
     }
   }
   jsonCycle: (_|_){
@@ -884,14 +857,7 @@ Result:
 diff old new
 --- old
 +++ new
-@@ -1,26 +1,52 @@
- Errors:
-+0.properties.foo: cannot combine regular field "required" with null:
-+    ./issue3634.cue:6:26
-+0.properties.foo: conflicting values null and {required:["bar","baz"]} (mismatched types null and struct):
-+    ./issue3634.cue:6:26
-+    ./issue3634.cue:11:20
- noCycle.t1.#x: invalid value {} (does not satisfy matchN): 0 matched, expected 1:
+@@ -3,24 +3,39 @@
      ./cycle.cue:4:7
      ./cycle.cue:4:14
      ./cycle.cue:5:13
@@ -919,12 +885,6 @@ diff old new
 +    ./cycle.cue:31:13
 +issue3649.cycle.t1.data.a.a: structural cycle:
 +    ./cycle.cue:31:6
-+0.properties.foo: structural cycle:
-+    ./issue3634.cue:6:33
-+0.properties.foo: 3 errors in empty disjunction::
-+    ./issue3634.cue:9:26
-+0.a: structural cycle:
-+    ./issue3634.cue:17:7
 +jsonCycle.t1.x.y: invalid value "{}" (does not satisfy encoding/json.Validate): error in call to encoding/json.Validate: structural cycle:
 +    ./jsoncycle.cue:4:8
 +    ./jsoncycle.cue:5:8
@@ -949,7 +909,7 @@ diff old new
  issue3443.cycle2.fail.#S: invalid value {n:{n:{n:_}}} (does not satisfy matchN): 0 matched, expected 1:
      ./matchn.cue:55:13
      ./matchn.cue:55:20
-@@ -53,26 +79,21 @@
+@@ -53,26 +68,21 @@
      ./yamlcycle.cue:15:8
  selfCycle.t1.c.d.d.d: structural cycle:
      ./yamlcycle.cue:14:5
@@ -991,7 +951,7 @@ diff old new
 
  Result:
  (_|_){
-@@ -88,10 +109,6 @@
+@@ -88,10 +98,6 @@
            //     ./cycle.cue:4:7
            //     ./cycle.cue:4:14
            //     ./cycle.cue:5:13
@@ -1002,7 +962,7 @@ diff old new
          }
        }
        #x: (_|_){
-@@ -99,21 +116,20 @@
+@@ -99,21 +105,20 @@
          //     ./cycle.cue:4:7
          //     ./cycle.cue:4:14
          //     ./cycle.cue:5:13
@@ -1038,23 +998,23 @@ diff old new
          }
          #c: (#struct){
            b?: (string){ string }
-@@ -125,7 +141,6 @@
+@@ -125,7 +130,6 @@
        }
        t2: (struct){
          x: (struct){
 -          b?: (string){ string }
            y: (struct){
              a: (struct){
                d: (struct){
-@@ -133,6 +148,7 @@
+@@ -133,6 +137,7 @@
                }
              }
            }
 +          b?: (string){ string }
          }
          c: (struct){
            b?: (string){ string }
-@@ -147,13 +163,22 @@
+@@ -147,13 +152,22 @@
          }
        }
      }
@@ -1084,56 +1044,7 @@ diff old new
          }
          #c: (#struct){
            b: (string){ string }
-@@ -219,8 +244,10 @@
-       host: (string){ "mod.test" }
-     }
-   }
--  issue3634: (struct){
--    full: (struct){
-+  issue3634: (_|_){
-+    // [structural cycle]
-+    full: (_|_){
-+      // [structural cycle]
-       #Schema: (#struct){
-         required?: (list){
-         }
-@@ -227,9 +254,20 @@
-         properties?: (#struct){
-         }
-       }
--      out: (int){ 3 }
--    }
--    reduced: (struct){
-+      out: (_|_){
-+        // [structural cycle] 0.properties.foo: cannot combine regular field "required" with null:
-+        //     ./issue3634.cue:6:26
-+        // 0.properties.foo: conflicting values null and {required:["bar","baz"]} (mismatched types null and struct):
-+        //     ./issue3634.cue:6:26
-+        //     ./issue3634.cue:11:20
-+        // 0.properties.foo: structural cycle:
-+        //     ./issue3634.cue:6:33
-+        // 0.properties.foo: 3 errors in empty disjunction::
-+        //     ./issue3634.cue:9:26
-+      }
-+    }
-+    reduced: (_|_){
-+      // [structural cycle]
-       #D: (#struct){
-         b?: (int){ int }
-         a?: (_|_){
-@@ -236,7 +274,10 @@
-           // [structural cycle] issue3634.reduced.#D.a: structural cycle
-         }
-       }
--      out: (int){ 1 }
-+      out: (_|_){
-+        // [structural cycle] 0.a: structural cycle:
-+        //     ./issue3634.cue:17:7
-+      }
-     }
-   }
-   jsonCycle: (_|_){
-@@ -244,8 +285,12 @@
+@@ -244,8 +258,12 @@
      t1: (_|_){
        // [structural cycle]
        x: (_|_){
@@ -1148,7 +1059,7 @@ diff old new
        }
      }
    }
-@@ -254,8 +299,15 @@
+@@ -254,8 +272,15 @@
      structCycle: (_|_){
        // [eval]
        x: (_|_){
@@ -1166,7 +1077,7 @@ diff old new
        }
      }
      ok: (struct){
-@@ -318,7 +370,7 @@
+@@ -318,7 +343,7 @@
            }
          }) }
        noHang: (struct){
@@ -1175,7 +1086,7 @@ diff old new
            n: (struct){
              n: (_){ _ }
            }
-@@ -333,7 +385,8 @@
+@@ -333,7 +358,8 @@
            }
          }) }
      }
@@ -1185,7 +1096,7 @@ diff old new
        #S: (_){ matchN(1, (#list){
            0: (_|_){// {
              //   n: 〈2;#S〉
-@@ -348,8 +401,21 @@
+@@ -348,8 +374,21 @@
              }
            }) }
        }
@@ -1209,7 +1120,7 @@ diff old new
            n: (struct){
              n: (_){ _ }
            }
-@@ -417,8 +483,8 @@
+@@ -417,8 +456,8 @@
        a?: ((string|bytes)){ "encoding/yaml".Validate(yamlNoCycle.#c) }
      }
      data: (#struct){
@@ -1219,7 +1130,7 @@ diff old new
      }
    }
    selfCycle: (_|_){
-@@ -446,19 +512,8 @@
+@@ -446,19 +485,8 @@
          }
        }
      }
@@ -1241,7 +1152,7 @@ diff old new
        }
      }
      yamlVal: (_|_){
-@@ -466,25 +521,33 @@
+@@ -466,25 +494,33 @@
        t1: (_|_){
          // [eval]
          x: (_|_){
@@ -1289,7 +1200,7 @@ diff old new
          }
        }
        t2: (_|_){
-@@ -492,13 +555,16 @@
+@@ -492,13 +528,16 @@
          z: (_|_){
            // [eval]
            y: (_|_){
@@ -1313,7 +1224,7 @@ diff old new
          }
        }
      }
-@@ -505,8 +571,12 @@
+@@ -505,8 +544,12 @@
      yamlValidatePartial: (_|_){
        // [structural cycle]
        x: (_|_){