internal/core/eval: add more positions to conflict errors

This should bring conflict errors mostly up to par with v0.2.2.

It also adds some context errors for definitions. More refined
tracing of references (in acceptor.Canopy) will be able to
address Issue #129.

Change-Id: Ic359a324c2d3034b4895b06cb7f91c3c546a8a0a
Reviewed-on: https://cue-review.googlesource.com/c/cue/+/7302
Reviewed-by: CUE cueckoo <[email protected]>
Reviewed-by: Marcel van Lohuizen <[email protected]>

Author: mpvl

cmd/cue/cmd/testdata/script/cmd_baddisplay.txt

@@ -3,7 +3,9 @@
 cmp stderr cmd_baddisplay.out
 
 -- cmd_baddisplay.out --
-command.baddisplay.display.text: conflicting values 42 and string (mismatched types int and string)
+command.baddisplay.display.text: conflicting values 42 and string (mismatched types int and string):
+    ./task_tool.cue:6:9
+    tool/cli:4:9
 -- task.cue --
 package home
 message: "Hello world!"

cmd/cue/cmd/testdata/script/def_jsonschema.txt

@@ -68,7 +68,11 @@ unsupported constraint "foo":
 age: twenty
 
 -- expect-stderr2 --
-age: conflicting values "twenty" and int (mismatched types string and int)
+age: conflicting values "twenty" and int (mismatched types string and int):
+    ./data.yaml:1:7
+    ./schema.json:18:7
 -- expect-stderr3 --
-age: conflicting values "twenty" and int (mismatched types string and int)
+age: conflicting values "twenty" and int (mismatched types string and int):
+    ./data.yaml:1:7
+    ./schema.json:18:7
 -- cue.mod --

cmd/cue/cmd/testdata/script/eval_errs.txt

@@ -4,8 +4,12 @@ cmp stdout expect-stdout
 
 -- expect-stdout --
 -- expect-stderr --
-bar.b: conflicting values 2 and string (mismatched types int and string)
-x.q: incompatible values "goodbye" and "hello"
+bar.b: conflicting values 2 and string (mismatched types int and string):
+    ./errs.cue:5:21
+    ./errs.cue:6:26
+x.q: conflicting values "goodbye" and "hello":
+    ./errs.cue:1:4
+    ./errs.cue:2:4
 -- errs.cue --
 a: "hello"
 b: "goodbye"

cmd/cue/cmd/testdata/script/vet_file.txt

@@ -6,10 +6,14 @@ cmp stderr expect-stderr2
 
 -- expect-stderr --
 translations.hello.lang: incomplete value string
-translations.hello.lang: conflicting values false and string (mismatched types bool and string)
+translations.hello.lang: conflicting values false and string (mismatched types bool and string):
+    ./data.yaml:13:11
+    ./vet.cue:3:31
 -- expect-stderr2 --
 translations.hello.lang: incomplete value string
-translations.hello.lang: conflicting values false and string (mismatched types bool and string)
+translations.hello.lang: conflicting values false and string (mismatched types bool and string):
+    ./data.yaml:13:11
+    ./vet.cue:3:31
 -- vet.cue --
 package foo
 

cue/testdata/basicrewrite/001_regexp.txtar

@@ -66,7 +66,9 @@ e3: _|_ // conflicting values !="a" and <5 (mismatched types string and number)
 }
 -- out/eval --
 Errors:
-e3: conflicting values !="a" and <5 (mismatched types string and number)
+e3: conflicting values !="a" and <5 (mismatched types string and number):
+    ./in.cue:22:5
+    ./in.cue:22:13
 b3: invalid value "foo" (out of bound =~"[a-z]{4}"):
     ./in.cue:10:5
 e1: cannot use 1 (type int) as type (string|bytes):
@@ -101,6 +103,8 @@ Result:
     //     ./in.cue:21:5
   }
   e3: (_|_){
-    // [eval] e3: conflicting values !="a" and <5 (mismatched types string and number)
+    // [eval] e3: conflicting values !="a" and <5 (mismatched types string and number):
+    //     ./in.cue:22:5
+    //     ./in.cue:22:13
   }
 }

cue/testdata/basicrewrite/004_booleans.txtar

@@ -27,14 +27,18 @@ e: _|_ // conflicting values true and false
 }
 -- out/eval --
 Errors:
-e: incompatible values false and true
+e: conflicting values false and true:
+    ./in.cue:5:4
+    ./in.cue:6:4
 
 Result:
 (_|_){
   // [eval]
   t: (bool){ true }
   f: (bool){ false }
   e: (_|_){
-    // [eval] e: incompatible values false and true
+    // [eval] e: conflicting values false and true:
+    //     ./in.cue:5:4
+    //     ./in.cue:6:4
   }
 }

cue/testdata/basicrewrite/005_boolean_arithmetic.txtar

@@ -30,7 +30,9 @@ f: _|_ // conflicting values true and false
 }
 -- out/eval --
 Errors:
-f: incompatible values false and true
+f: conflicting values false and true:
+    ./in.cue:6:4
+    ./in.cue:6:11
 
 Result:
 (_|_){
@@ -41,6 +43,8 @@ Result:
   d: (bool){ true }
   e: (bool){ true }
   f: (_|_){
-    // [eval] f: incompatible values false and true
+    // [eval] f: conflicting values false and true:
+    //     ./in.cue:6:4
+    //     ./in.cue:6:11
   }
 }

cue/testdata/basicrewrite/006_basic_type.txtar

@@ -34,7 +34,9 @@ f: true
 }
 -- out/eval --
 Errors:
-d: conflicting values int and float (mismatched types int and float)
+d: conflicting values int and float (mismatched types int and float):
+    ./in.cue:5:4
+    ./in.cue:5:10
 
 Result:
 (_|_){
@@ -43,7 +45,9 @@ Result:
   b: (int){ 1 }
   c: (float){ 1.0 }
   d: (_|_){
-    // [eval] d: conflicting values int and float (mismatched types int and float)
+    // [eval] d: conflicting values int and float (mismatched types int and float):
+    //     ./in.cue:5:4
+    //     ./in.cue:5:10
   }
   e: (string){ "4" }
   f: (bool){ true }

cue/testdata/basicrewrite/010_lists.txtar

@@ -76,15 +76,19 @@ e5: [1, 2, 4, _|_, // invalid value 8 (out of bound <=5)
 }
 -- out/eval --
 Errors:
-e: conflicting values 4 and [] (mismatched types int and list)
+e: conflicting values 4 and [] (mismatched types int and list):
+    ./in.cue:4:8
+    ./in.cue:4:13
 e2: invalid list index d (type string):
     ./in.cue:5:12
 e3: invalid negative index -1:
     ./in.cue:6:8
 e4.3: invalid value 8 (out of bound <=5):
     ./in.cue:7:24
+    ./in.cue:7:41
 e5.3: invalid value 8 (out of bound <=5):
     ./in.cue:8:39
+    ./in.cue:8:18
 
 Result:
 (_|_){
@@ -101,7 +105,9 @@ Result:
     2: (int){ 3 }
   }
   e: (_|_){
-    // [eval] e: conflicting values 4 and [] (mismatched types int and list)
+    // [eval] e: conflicting values 4 and [] (mismatched types int and list):
+    //     ./in.cue:4:8
+    //     ./in.cue:4:13
   }
   e2: (_|_){
     // [eval] e2: invalid list index d (type string):
@@ -119,6 +125,7 @@ Result:
     3: (_|_){
       // [eval] e4.3: invalid value 8 (out of bound <=5):
       //     ./in.cue:7:24
+      //     ./in.cue:7:41
     }
   }
   e5: (_|_){
@@ -129,6 +136,7 @@ Result:
     3: (_|_){
       // [eval] e5.3: invalid value 8 (out of bound <=5):
       //     ./in.cue:8:39
+      //     ./in.cue:8:18
     }
   }
 }

cue/testdata/basicrewrite/013_obj_unify.txtar

@@ -75,7 +75,9 @@ e: _|_ // conflicting values 1 and {a: 3} (mismatched types int and struct)
 }
 -- out/eval --
 Errors:
-e: conflicting values 1 and {a:3} (mismatched types int and struct)
+e: conflicting values 1 and {a:3} (mismatched types int and struct):
+    ./in.cue:7:5
+    ./in.cue:8:4
 
 Result:
 (_|_){
@@ -97,7 +99,9 @@ Result:
     b: (int){ 2 }
   }
   e: (_|_){
-    // [eval] e: conflicting values 1 and {a:3} (mismatched types int and struct)
+    // [eval] e: conflicting values 1 and {a:3} (mismatched types int and struct):
+    //     ./in.cue:7:5
+    //     ./in.cue:8:4
     a: (int){ 3 }
   }
 }