internal/core/adt: revert 1217228

This caused more harm than good.

See https://cuelang.org/cl/1217228

Issue #3977
Open #3977

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

Author: mpvl

cue/testdata/eval/nonrooted.txtar

@@ -58,21 +58,12 @@ Conjuncts:    87
 Disjuncts:    68
 -- out/evalalpha --
 Errors:
-issue3977.inlineLet.p.x: conflicting values 1 and 2:
-    ./in.cue:38:14
-    ./in.cue:43:6
-x: conflicting values 1 and 2:
-    ./in.cue:2:14
-    ./in.cue:8:18
 x: conflicting values 2 and 1:
     ./in.cue:20:14
     ./in.cue:26:19
 x: conflicting values 4 and 1:
     ./in.cue:20:14
     ./in.cue:26:23
-x: invalid interpolation: 3 errors in empty disjunction::
-    ./in.cue:14:8
-    ./in.cue:14:17
 x: 2 errors in empty disjunction::
     ./in.cue:23:8
 
@@ -81,21 +72,15 @@ Result:
   // [eval]
   issue3977: (_|_){
     // [eval]
-    inlineExpr: (_|_){
-      // [eval]
+    inlineExpr: (struct){
       #NetworkID: (int){ 1 }
       #fn: (#struct){
         x: (int){ 1 }
         out: (int){ 2 }
       }
-      err: (_|_){
-        // [eval] x: conflicting values 1 and 2:
-        //     ./in.cue:2:14
-        //     ./in.cue:8:18
-      }
+      err: (int){ 3 }
     }
-    inlineDisj1: (_|_){
-      // [eval]
+    inlineDisj1: (struct){
       #NetworkID: (string){ |((string){ "2" }, (string){ "3" }, (string){ "4" }) }
       #fn: (#struct){
         x: (string){ |((string){ "2" }, (string){ "3" }, (string){ "4" }) }
@@ -104,11 +89,7 @@ Result:
           //     ./in.cue:14:8
         }
       }
-      err: (_|_){
-        // [eval] x: invalid interpolation: 3 errors in empty disjunction::
-        //     ./in.cue:14:8
-        //     ./in.cue:14:17
-      }
+      err: (string){ "value=invalid" }
     }
     inlineDisj2: (_|_){
       // [eval]
@@ -136,8 +117,7 @@ Result:
       }
       err: (int){ 11 }
     }
-    inlineLet: (_|_){
-      // [eval]
+    inlineLet: (struct){
       #NetworkID: (int){ 1 }
       let p#1 = (_|_){
         // [eval]
@@ -152,26 +132,16 @@ Result:
           //     ./in.cue:43:6
         }
       }
-      err: (_|_){
-        // [eval] issue3977.inlineLet.p.x: conflicting values 1 and 2:
-        //     ./in.cue:38:14
-        //     ./in.cue:43:6
-      }
+      err: (int){ 12 }
     }
   }
 }
 -- diff/-out/evalalpha<==>+out/eval --
 diff old new
 --- old
 +++ new
-@@ -1,14 +1,19 @@
+@@ -1,13 +1,9 @@
  Errors:
-+issue3977.inlineLet.p.x: conflicting values 1 and 2:
-+    ./in.cue:38:14
-+    ./in.cue:43:6
-+x: conflicting values 1 and 2:
-+    ./in.cue:2:14
-+    ./in.cue:8:18
  x: conflicting values 2 and 1:
      ./in.cue:20:14
 -    ./in.cue:22:8
@@ -182,52 +152,9 @@ diff old new
 -    ./in.cue:22:8
 -    ./in.cue:26:8
      ./in.cue:26:23
-+x: invalid interpolation: 3 errors in empty disjunction::
-+    ./in.cue:14:8
-+    ./in.cue:14:17
  x: 2 errors in empty disjunction::
      ./in.cue:23:8
- 
-@@ -17,15 +22,21 @@
-   // [eval]
-   issue3977: (_|_){
-     // [eval]
--    inlineExpr: (struct){
-+    inlineExpr: (_|_){
-+      // [eval]
-       #NetworkID: (int){ 1 }
-       #fn: (#struct){
-         x: (int){ 1 }
-         out: (int){ 2 }
-       }
--      err: (int){ 3 }
--    }
--    inlineDisj1: (struct){
-+      err: (_|_){
-+        // [eval] x: conflicting values 1 and 2:
-+        //     ./in.cue:2:14
-+        //     ./in.cue:8:18
-+      }
-+    }
-+    inlineDisj1: (_|_){
-+      // [eval]
-       #NetworkID: (string){ |((string){ "2" }, (string){ "3" }, (string){ "4" }) }
-       #fn: (#struct){
-         x: (string){ |((string){ "2" }, (string){ "3" }, (string){ "4" }) }
-@@ -34,7 +45,11 @@
-           //     ./in.cue:14:8
-         }
-       }
--      err: (string){ "value=invalid" }
-+      err: (_|_){
-+        // [eval] x: invalid interpolation: 3 errors in empty disjunction::
-+        //     ./in.cue:14:8
-+        //     ./in.cue:14:17
-+      }
-     }
-     inlineDisj2: (_|_){
-       // [eval]
-@@ -46,13 +61,9 @@
+@@ -46,13 +42,9 @@
        err: (_|_){
          // [eval] x: conflicting values 2 and 1:
          //     ./in.cue:20:14
@@ -241,14 +168,7 @@ diff old new
          //     ./in.cue:26:23
          // x: 2 errors in empty disjunction::
          //     ./in.cue:23:8
-@@ -66,24 +77,27 @@
-       }
-       err: (int){ 11 }
-     }
--    inlineLet: (struct){
-+    inlineLet: (_|_){
-+      // [eval]
-       #NetworkID: (int){ 1 }
+@@ -71,15 +63,13 @@
        let p#1 = (_|_){
          // [eval]
          x: (_|_){
@@ -261,28 +181,16 @@ diff old new
 -          // [eval] issue3977.inlineLet.p.x: conflicting values 2 and 1:
 -          //     ./in.cue:38:14
 -          //     ./in.cue:40:8
--          //     ./in.cue:43:6
--        }
--      }
--      err: (int){ 12 }
 +          // [eval] issue3977.inlineLet.p.x: conflicting values 1 and 2:
 +          //     ./in.cue:38:14
 +          //     ./in.cue:43:6
 +        }
 +        out: (_|_){
 +          // [eval] issue3977.inlineLet.p.x: conflicting values 1 and 2:
 +          //     ./in.cue:38:14
-+          //     ./in.cue:43:6
-+        }
-+      }
-+      err: (_|_){
-+        // [eval] issue3977.inlineLet.p.x: conflicting values 1 and 2:
-+        //     ./in.cue:38:14
-+        //     ./in.cue:43:6
-+      }
-     }
-   }
- }
+           //     ./in.cue:43:6
+         }
+       }
 -- diff/explanation --
 evalv3 correctly fails on all places marked with "err"
 -- out/eval --

internal/core/adt/context.go

@@ -706,10 +706,13 @@ func (c *OpContext) evalStateCI(v Expr, state combinedFlags) (result Value, ci C
 		if arc == nil {
 			return nil, c.ci
 		}
-		if arc.Internal() && c.isDevVersion() {
-			mode := state.conditions()
-			state = final(partial, mode|allTasksCompleted)
-		}
+		// TODO(3977): register internal nodes for later verifications. The
+		// following limits the possibility of some common and useful cycles.
+		//
+		// if arc.Internal() && c.isDevVersion() {
+		//  mode := state.conditions()
+		//  state = final(partial, mode|allTasksCompleted)
+		// }
 		orig := arc
 		// TODO(deref): what is the right level of dereferencing here?
 		// DerefValue seems to work too.