Untagged error messages (#6290)

cristianoc · web-flow · commit 3ad5cb15e5fd · 2023-06-07T09:23:06.000+02:00
* Untagged variants error messages Add tests. See #6272 * format * Better error message for constructor with more than one argument. * refactor: clarity * Treat cases with non-unary payloads uniformly. * Remove unused cases. * Improve error message for unknown case. * Update CHANGELOG.md Fixes #6272
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -24,6 +24,7 @@
 #### :bug: Bug Fix
 
 - Fix issue where uncurried type internals leak in type error. https://github.com/rescript-lang/rescript-compiler/pull/6264
+- Improve error messages for untagged variant definitions https://github.com/rescript-lang/rescript-compiler/pull/6290
 
 
 # 11.0.0-beta.1
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedNonUnary1.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedNonUnary1.res.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/UntaggedNonUnary1.res[0m:[2m2:1-27[0m
+
+  1 [2m│[0m @unboxed
+  [1;31m2[0m [2m│[0m [1;31mtype t = Tuple(int, string)[0m
+  3 [2m│[0m 
+
+  This untagged variant definition is invalid: Constructor Tuple has more than one argument.
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedNonUnary2.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedNonUnary2.res.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/UntaggedNonUnary2.res[0m:[2m2:1-42[0m
+
+  1 [2m│[0m @unboxed
+  [1;31m2[0m [2m│[0m [1;31mtype t = Tuple(int, string) | Float(float)[0m
+  3 [2m│[0m 
+
+  This untagged variant definition is invalid: Constructor Tuple has more than one argument.
diff --git a/jscomp/build_tests/super_errors/expected/UntaggedUnknown.res.expected b/jscomp/build_tests/super_errors/expected/UntaggedUnknown.res.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/UntaggedUnknown.res[0m:[2m2:10-31[0m
+
+  1 [2m│[0m @unboxed
+  [1;31m2[0m [2m│[0m type t = [1;31mTuple((float, string))[0m | Float(float)
+  3 [2m│[0m 
+
+  This untagged variant definition is invalid: Case Tuple has a payload that is not of one of the recognized shapes (object, array, etc). Then it must be the only case with payloads.
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary1.res b/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary1.res
@@ -0,0 +1,2 @@
+@unboxed
+type t = Tuple(int, string)
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary2.res b/jscomp/build_tests/super_errors/fixtures/UntaggedNonUnary2.res
@@ -0,0 +1,2 @@
+@unboxed
+type t = Tuple(int, string) | Float(float)
diff --git a/jscomp/build_tests/super_errors/fixtures/UntaggedUnknown.res b/jscomp/build_tests/super_errors/fixtures/UntaggedUnknown.res
@@ -0,0 +1,2 @@
+@unboxed
+type t = Tuple((float, string)) | Float(float)
diff --git a/jscomp/ml/ast_untagged_variants.ml b/jscomp/ml/ast_untagged_variants.ml
diff --git a/jscomp/ml/typedecl.ml b/jscomp/ml/typedecl.ml

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
++
 +  [1;31mWe've found a bug for you![0m
 +  [36m/.../fixtures/UntaggedNonUnary1.res[0m:[2m2:1-27[0m
++
 +  1 [2m│[0m @unboxed
 +  [1;31m2[0m [2m│[0m [1;31mtype t = Tuple(int, string)[0m
 +  3 [2m│[0m
++
 +  This untagged variant definition is invalid: Constructor Tuple has more than one argument.
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@unboxed`
	`2`	`+type t = Tuple(int, string)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@unboxed`
	`2`	`+type t = Tuple(int, string) \| Float(float)`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+@unboxed`
	`2`	`+type t = Tuple((float, string)) \| Float(float)`