Add throw

aspeddro · aspeddro · commit 835efe4ab799 · 2025-03-17T10:12:56.000-03:00
Deprecate `raise` and rename references
diff --git a/lib/es6/Stdlib.js b/lib/es6/Stdlib.js
@@ -3,6 +3,10 @@
 import * as Stdlib_Error from "./Stdlib_Error.js";
 import * as Primitive_object from "./Primitive_object.js";
 
+function $$throw(prim) {
+  throw prim;
+}
+
 function assertEqual(a, b) {
   if (!Primitive_object.notequal(a, b)) {
     return;
@@ -11,7 +15,7 @@ function assertEqual(a, b) {
     RE_EXN_ID: "Assert_failure",
     _1: [
       "Stdlib.res",
-      117,
+      118,
       4
     ],
     Error: new Error()
@@ -154,6 +158,7 @@ export {
   $$BigInt64Array,
   $$BigUint64Array,
   panic,
+  $$throw,
   assertEqual,
 }
 /* No side effect */
diff --git a/lib/js/Stdlib.js b/lib/js/Stdlib.js
@@ -3,6 +3,10 @@
 let Stdlib_Error = require("./Stdlib_Error.js");
 let Primitive_object = require("./Primitive_object.js");
 
+function $$throw(prim) {
+  throw prim;
+}
+
 function assertEqual(a, b) {
   if (!Primitive_object.notequal(a, b)) {
     return;
@@ -11,7 +15,7 @@ function assertEqual(a, b) {
     RE_EXN_ID: "Assert_failure",
     _1: [
       "Stdlib.res",
-      117,
+      118,
       4
     ],
     Error: new Error()
@@ -153,5 +157,6 @@ exports.$$Uint8ClampedArray = $$Uint8ClampedArray;
 exports.$$BigInt64Array = $$BigInt64Array;
 exports.$$BigUint64Array = $$BigUint64Array;
 exports.panic = panic;
+exports.$$throw = $$throw;
 exports.assertEqual = assertEqual;
 /* No side effect */
diff --git a/runtime/Belt_List.res b/runtime/Belt_List.res
@@ -88,7 +88,7 @@ let head = x =>
 
 let headExn = x =>
   switch x {
-  | list{} => raise(Not_found)
+  | list{} => throw(Not_found)
   | list{x, ..._} => x
   }
 
@@ -100,7 +100,7 @@ let tail = x =>
 
 let tailExn = x =>
   switch x {
-  | list{} => raise(Not_found)
+  | list{} => throw(Not_found)
   | list{_, ...t} => t
   }
 
@@ -126,7 +126,7 @@ let rec nthAuxAssert = (x, n) =>
     } else {
       nthAuxAssert(t, n - 1)
     }
-  | _ => raise(Not_found)
+  | _ => throw(Not_found)
   }
 
 let get = (x, n) =>
@@ -138,7 +138,7 @@ let get = (x, n) =>
 
 let getExn = (x, n) =>
   if n < 0 {
-    raise(Not_found)
+    throw(Not_found)
   } else {
     nthAuxAssert(x, n)
   }
diff --git a/runtime/Belt_MutableQueue.res b/runtime/Belt_MutableQueue.res
@@ -72,7 +72,7 @@ let peekUndefined = q =>
 
 let peekExn = q =>
   switch q.first {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(v) => v.content
   }
 
@@ -95,7 +95,7 @@ let pop = q =>
 let popExn = q =>
   /* TO fix */
   switch q.first {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(x) =>
     let next = x.next
     if next == None {
diff --git a/runtime/Belt_Option.res b/runtime/Belt_Option.res
@@ -37,7 +37,7 @@ let forEach = (opt, f) =>
 let getExn = x =>
   switch x {
   | Some(x) => x
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   }
 
 external getUnsafe: option<'a> => 'a = "%identity"
diff --git a/runtime/Belt_Result.res b/runtime/Belt_Result.res
@@ -29,7 +29,7 @@ type t<'a, 'b> = result<'a, 'b> =
 let getExn = x =>
   switch x {
   | Ok(x) => x
-  | Error(_) => raise(Not_found)
+  | Error(_) => throw(Not_found)
   }
 
 let mapWithDefault = (opt, default, f) =>
diff --git a/runtime/Belt_internalAVLset.res b/runtime/Belt_internalAVLset.res
@@ -590,7 +590,7 @@ let rec getUndefined = (n: t<_>, x, ~cmp) =>
 
 let rec getExn = (n: t<_>, x, ~cmp) =>
   switch n {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(t) /* Node(l, v, r, _) */ =>
     let v = t.value
     let c = Belt_Id.getCmpInternal(cmp)(x, v)
diff --git a/runtime/Belt_internalAVLtree.res b/runtime/Belt_internalAVLtree.res
@@ -713,7 +713,7 @@ let rec getUndefined = (n, x, ~cmp) =>
 
 let rec getExn = (n, x, ~cmp) =>
   switch n {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(n) /* Node(l, v, d, r, _) */ =>
     let v = n.key
     let c = Belt_Id.getCmpInternal(cmp)(x, v)
diff --git a/runtime/Belt_internalMapInt.res b/runtime/Belt_internalMapInt.res
@@ -65,7 +65,7 @@ let rec getUndefined = (n, x: key) =>
 
 let rec getExn = (n, x: key) =>
   switch n {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(n) =>
     let v = n.N.key
     if x == v {
diff --git a/runtime/Belt_internalMapString.res b/runtime/Belt_internalMapString.res
@@ -65,7 +65,7 @@ let rec getUndefined = (n, x: key) =>
 
 let rec getExn = (n, x: key) =>
   switch n {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(n) =>
     let v = n.N.key
     if x == v {
diff --git a/runtime/Belt_internalSetInt.res b/runtime/Belt_internalSetInt.res
@@ -106,7 +106,7 @@ let rec getUndefined = (n: t, x: value) =>
 
 let rec getExn = (n: t, x: value) =>
   switch n {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(t) =>
     let v = t.value
     if x == v {
diff --git a/runtime/Belt_internalSetString.res b/runtime/Belt_internalSetString.res
@@ -106,7 +106,7 @@ let rec getUndefined = (n: t, x: value) =>
 
 let rec getExn = (n: t, x: value) =>
   switch n {
-  | None => raise(Not_found)
+  | None => throw(Not_found)
   | Some(t) =>
     let v = t.value
     if x == v {
diff --git a/runtime/Pervasives.res b/runtime/Pervasives.res
@@ -1,6 +1,6 @@
 /**
    Since [others] depend on this file, its public mli files **should not
-   export types** introduced here, otherwise it would cause 
+   export types** introduced here, otherwise it would cause
    conflicts here.
 
    If the type exported here is also exported in modules from others,
@@ -16,10 +16,10 @@ __unsafe_cast: 'a => 'b = "%identity"
 external raise: exn => 'a = "%raise"
 
 @deprecated("Use custom exception instead")
-let failwith = s => raise(Failure(s))
+let failwith = s => throw(Failure(s))
 
 @deprecated("Use custom exception instead")
-let invalid_arg = s => raise(Invalid_argument(s))
+let invalid_arg = s => throw(Invalid_argument(s))
 
 @deprecated("Use custom exception instead") exception Exit
 
diff --git a/runtime/Pervasives_mini.res b/runtime/Pervasives_mini.res
@@ -1,5 +1,6 @@
 /* Exceptions */
 external raise: exn => 'a = "%raise"
+external throw: exn => 'a = "%raise"
 
 /* Debugging */
 
diff --git a/runtime/Primitive_array.res b/runtime/Primitive_array.res
@@ -2,14 +2,14 @@ let length = Primitive_array_extern.length
 
 let get = (xs, index) =>
   if index < 0 || index >= length(xs) {
-    raise(Invalid_argument("index out of bounds"))
+    throw(Invalid_argument("index out of bounds"))
   } else {
     xs->Primitive_array_extern.getUnsafe(index)
   }
 
 let set = (xs, index, newval) =>
   if index < 0 || index >= length(xs) {
-    raise(Invalid_argument("index out of bounds"))
+    throw(Invalid_argument("index out of bounds"))
   } else {
     xs->Primitive_array_extern.setUnsafe(index, newval)
   }
diff --git a/runtime/Primitive_bigint.res b/runtime/Primitive_bigint.res
@@ -25,7 +25,7 @@ external div: (bigint, bigint) => bigint = "%divbigint"
 
 let div = (x: bigint, y: bigint) =>
   if y == 0n {
-    raise(Division_by_zero)
+    throw(Division_by_zero)
   } else {
     div(x, y)
   }
@@ -34,7 +34,7 @@ external mod_: (bigint, bigint) => bigint = "%modbigint"
 
 let mod_ = (x: bigint, y: bigint) =>
   if y == 0n {
-    raise(Division_by_zero)
+    throw(Division_by_zero)
   } else {
     mod_(x, y)
   }
diff --git a/runtime/Primitive_int.res b/runtime/Primitive_int.res
@@ -23,14 +23,14 @@ let max = (x: int, y: int): int =>
 
 let div = (x: int, y: int) =>
   if y == 0 {
-    raise(Division_by_zero)
+    throw(Division_by_zero)
   } else {
     Primitive_int_extern.div(x, y)
   }
 
 let mod_ = (x: int, y: int) =>
   if y == 0 {
-    raise(Division_by_zero)
+    throw(Division_by_zero)
   } else {
     Primitive_int_extern.mod_(x, y)
   }
diff --git a/runtime/Primitive_lazy.res b/runtime/Primitive_lazy.res
@@ -50,7 +50,7 @@ exception Undefined
   }
 )
 
-%%private(let raise_undefined = () => raise(Undefined))
+%%private(let raise_undefined = () => throw(Undefined))
 
 /* Assume [blk] is a block with tag lazy */
 %%private(
@@ -59,8 +59,8 @@ exception Undefined
     blk.value = fnToVal(raise_undefined)
     try forward_with_closure(blk, closure) catch {
     | e =>
-      blk.value = fnToVal(() => raise(e))
-      raise(e)
+      blk.value = fnToVal(() => throw(e))
+      throw(e)
     }
   }
 )
diff --git a/runtime/Primitive_module.res b/runtime/Primitive_module.res
@@ -19,7 +19,7 @@ module type Empty = {}
     in the lambda layer
 */
 let init = (loc: (string, int, int), shape: shape) => {
-  let undef_module = _ => raise(Undefined_recursive_module(loc))
+  let undef_module = _ => throw(Undefined_recursive_module(loc))
   let rec loop = (shape: shape, struct_: Obj.t, idx) =>
     switch shape {
     | Function => Obj.setField(struct_, idx, Obj.magic(undef_module))
diff --git a/runtime/Primitive_object.res b/runtime/Primitive_object.res
@@ -94,7 +94,7 @@ let rec compare = (a: t, b: t): int =>
     | ("boolean", "boolean") => Pervasives.compare((magic(a): bool), magic(b))
     | ("boolean", _) => 1
     | (_, "boolean") => -1
-    | ("function", "function") => raise(Invalid_argument("compare: functional value"))
+    | ("function", "function") => throw(Invalid_argument("compare: functional value"))
     | ("function", _) => 1
     | (_, "function") => -1
     | ("bigint", "bigint")
@@ -261,7 +261,7 @@ let rec equal = (a: t, b: t): bool =>
     } else {
       let b_type = Js.typeof(b)
       if a_type == "function" || b_type == "function" {
-        raise(Invalid_argument("equal: functional value"))
+        throw(Invalid_argument("equal: functional value"))
       } /* first, check using reference equality */
       else if (
         /* a_type = "object" || "symbol" */
diff --git a/runtime/Primitive_string.res b/runtime/Primitive_string.res
@@ -23,7 +23,7 @@ let max = (x: string, y: string): string =>
 
 let getChar = (s, i) =>
   if i >= Primitive_string_extern.length(s) || i < 0 {
-    raise(Invalid_argument("index out of bounds"))
+    throw(Invalid_argument("index out of bounds"))
   } else {
     Primitive_string_extern.getChar(s, i)
   }
diff --git a/runtime/Primitive_util.res b/runtime/Primitive_util.res
@@ -2,7 +2,7 @@ module Js = Primitive_js_extern
 
 let raiseWhenNotFound = x =>
   if Js.testAny(x) {
-    raise(Not_found)
+    throw(Not_found)
   } else {
     x
   }
diff --git a/runtime/Stdlib.res b/runtime/Stdlib.res
@@ -100,6 +100,7 @@ async function main() {
 external import: 'a => promise<'a> = "%import"
 
 let panic = Error.panic
+let throw = Error.throw
 
 /**
 `assertEqual(a, b)` check if `a` is equal `b`. If not raise a panic exception
diff --git a/runtime/Stdlib_Error.res b/runtime/Stdlib_Error.res
@@ -40,4 +40,6 @@ module URIError = {
 
 external raise: t => 'a = "%raise"
 
+external throw: t => 'a = "%raise"
+
 let panic = msg => make(`Panic! ${msg}`)->raise
diff --git a/runtime/Stdlib_Error.resi b/runtime/Stdlib_Error.resi
@@ -155,8 +155,26 @@ if 5 > 10 {
 }
 ```
 */
+@deprecated("Use `Error.throw` instead.")
 external raise: t => 'a = "%raise"
 
+/**
+Throw and exception provided `Error.t`, which will stop execution.
+
+## Examples
+
+```rescript
+let error = Error.make("Everything is upside down.")
+
+if 5 > 10 {
+  error->Error.throw
+} else {
+  Console.log("Phew, sanity still rules.")
+}
+```
+*/
+external throw: t => 'a = "%raise"
+
 /**
 Raises a panic exception with the given message.
 
diff --git a/runtime/Stdlib_Exn.res b/runtime/Stdlib_Exn.res
diff --git a/runtime/Stdlib_Int.res b/runtime/Stdlib_Int.res
diff --git a/runtime/Stdlib_List.res b/runtime/Stdlib_List.res
diff --git a/runtime/Stdlib_Null.res b/runtime/Stdlib_Null.res
diff --git a/runtime/Stdlib_Nullable.res b/runtime/Stdlib_Nullable.res
diff --git a/runtime/Stdlib_Result.res b/runtime/Stdlib_Result.res
diff --git a/tests/analysis_tests/tests/src/expected/CompletionExpressions.res.txt b/tests/analysis_tests/tests/src/expected/CompletionExpressions.res.txt
diff --git a/tests/analysis_tests/tests/src/expected/CompletionFunctionArguments.res.txt b/tests/analysis_tests/tests/src/expected/CompletionFunctionArguments.res.txt
diff --git a/tests/analysis_tests/tests/src/expected/CompletionJsxProps.res.txt b/tests/analysis_tests/tests/src/expected/CompletionJsxProps.res.txt
diff --git a/tests/gentype_tests/typescript-react-example/package-lock.json b/tests/gentype_tests/typescript-react-example/package-lock.json

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ let head = x =>`
`88`	`88`
`89`	`89`	`let headExn = x =>`
`90`	`90`	`switch x {`
`91`		`- \| list{} => raise(Not_found)`
	`91`	`+ \| list{} => throw(Not_found)`
`92`	`92`	`\| list{x, ..._} => x`
`93`	`93`	`}`
`94`	`94`
`@@ -100,7 +100,7 @@ let tail = x =>`
`100`	`100`
`101`	`101`	`let tailExn = x =>`
`102`	`102`	`switch x {`
`103`		`- \| list{} => raise(Not_found)`
	`103`	`+ \| list{} => throw(Not_found)`
`104`	`104`	`\| list{_, ...t} => t`
`105`	`105`	`}`
`106`	`106`
`@@ -126,7 +126,7 @@ let rec nthAuxAssert = (x, n) =>`
`126`	`126`	`} else {`
`127`	`127`	`nthAuxAssert(t, n - 1)`
`128`	`128`	`}`
`129`		`- \| _ => raise(Not_found)`
	`129`	`+ \| _ => throw(Not_found)`
`130`	`130`	`}`
`131`	`131`
`132`	`132`	`let get = (x, n) =>`
`@@ -138,7 +138,7 @@ let get = (x, n) =>`
`138`	`138`
`139`	`139`	`let getExn = (x, n) =>`
`140`	`140`	`if n < 0 {`
`141`		`- raise(Not_found)`
	`141`	`+ throw(Not_found)`
`142`	`142`	`} else {`
`143`	`143`	`nthAuxAssert(x, n)`
`144`	`144`	`}`
Original file line number	Diff line number	Diff line change
`@@ -37,7 +37,7 @@ let forEach = (opt, f) =>`
`37`	`37`	`let getExn = x =>`
`38`	`38`	`switch x {`
`39`	`39`	`\| Some(x) => x`
`40`		`- \| None => raise(Not_found)`
	`40`	`+ \| None => throw(Not_found)`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`external getUnsafe: option<'a> => 'a = "%identity"`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ type t<'a, 'b> = result<'a, 'b> =`
`29`	`29`	`let getExn = x =>`
`30`	`30`	`switch x {`
`31`	`31`	`\| Ok(x) => x`
`32`		`- \| Error(_) => raise(Not_found)`
	`32`	`+ \| Error(_) => throw(Not_found)`
`33`	`33`	`}`
`34`	`34`
`35`	`35`	`let mapWithDefault = (opt, default, f) =>`