assert condition

zth · zth · commit e05abdf51e65 · 2025-05-27T09:42:57.000+02:00
diff --git a/compiler/ml/error_message_utils.ml b/compiler/ml/error_message_utils.ml
@@ -75,6 +75,7 @@ type type_clash_context =
   | ArrayValue
   | MaybeUnwrapOption
   | IfCondition
+  | AssertCondition
   | IfReturn
   | SwitchReturn
   | TryReturn
@@ -118,6 +119,7 @@ let error_expected_type_text ppf type_clash_context =
     fprintf ppf "But a @{<info>for@} loop bounds must always be of type:"
   | Some IfCondition ->
     fprintf ppf "But @{<info>if@} conditions must always be of type:"
+  | Some AssertCondition -> fprintf ppf "But assertions must always be of type:"
   | Some IfReturn ->
     fprintf ppf "But this @{<info>if@} statement is expected to return:"
   | Some ArrayValue ->
diff --git a/compiler/ml/typecore.ml b/compiler/ml/typecore.ml
@@ -3068,8 +3068,9 @@ and type_expect_ ~context ?in_function ?(recarg = Rejected) env sexp ty_expected
         exp_env = env;
       }
   | Pexp_assert e ->
-    (* TODO: Add explicit AssertCondition *)
-    let cond = type_expect ~context:(Some IfCondition) env e Predef.type_bool in
+    let cond =
+      type_expect ~context:(Some AssertCondition) env e Predef.type_bool
+    in
     let exp_type =
       match cond.exp_desc with
       | Texp_construct (_, {cstr_name = "false"}, _) -> instance env ty_expected
diff --git a/tests/build_tests/super_errors/expected/assert_condition.res.expected b/tests/build_tests/super_errors/expected/assert_condition.res.expected
@@ -0,0 +1,9 @@
+
+  [1;31mWe've found a bug for you![0m
+  [36m/.../fixtures/assert_condition.res[0m:[2m1:8-14[0m
+
+  [1;31m1[0m [2m│[0m assert([1;31m"horse"[0m)
+  2 [2m│[0m 
+
+  This has type: [1;31mstring[0m
+  But assertions must always be of type: [1;33mbool[0m
diff --git a/tests/build_tests/super_errors/expected/for_loop_condition.res.expected b/tests/build_tests/super_errors/expected/for_loop_condition.res.expected
@@ -1,8 +1,8 @@
 
   [1;31mWe've found a bug for you![0m
-  [36m/.../fixtures/for_loop_condition.res[0m:[2m1:16-19[0m
+  [36m/.../fixtures/for_loop_condition.res[0m:[2m1:15-18[0m
 
-  [1;31m1[0m [2m│[0m for (x in 0 to [1;31m"10"[0m) {
+  [1;31m1[0m [2m│[0m for x in 0 to [1;31m"10"[0m {
   2 [2m│[0m   Console.log(x)
   3 [2m│[0m }
 
diff --git a/tests/build_tests/super_errors/fixtures/assert_condition.res b/tests/build_tests/super_errors/fixtures/assert_condition.res
@@ -0,0 +1 @@
+assert("horse")

-Original file line number
+Diff line change
@@ @@ -0,0 +1,9 @@ @@
++
 +  [1;31mWe've found a bug for you![0m
 +  [36m/.../fixtures/assert_condition.res[0m:[2m1:8-14[0m
++
 +  [1;31m1[0m [2m│[0m assert([1;31m"horse"[0m)
 +  2 [2m│[0m
++
 +  This has type: [1;31mstring[0m
 +  But assertions must always be of type: [1;33mbool[0m
-Original file line number
+Diff line change
@@ @@ -1,8 +1,8 @@ @@
   [1;31mWe've found a bug for you![0m
 -  [36m/.../fixtures/for_loop_condition.res[0m:[2m1:16-19[0m
 +  [36m/.../fixtures/for_loop_condition.res[0m:[2m1:15-18[0m
 -  [1;31m1[0m [2m│[0m for (x in 0 to [1;31m"10"[0m) {
 +  [1;31m1[0m [2m│[0m for x in 0 to [1;31m"10"[0m {
 [2m│[0m   Console.log(x)
 [2m│[0m }