Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

update reanalyze stdlib exception tracking #7328

Merged
merged 3 commits into from
Mar 11, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@
- Add `Dict.has` and double `Dict.forEachWithKey`/`Dict.mapValues` performance. https://github.com/rescript-lang/rescript/pull/7316
- Add popover attributes to JsxDOM.domProps. https://github.com/rescript-lang/rescript/pull/7317
- Add `inert` attribute to `JsxDOM.domProps`. https://github.com/rescript-lang/rescript/pull/7326
- Make reanalyze exception tracking work with the new stdlib. https://github.com/rescript-lang/rescript/pull/7328

#### :boom: Breaking Change

Expand Down
2 changes: 1 addition & 1 deletion analysis/reanalyze/src/Exn.ml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ let endOfFile = "End_of_file"
let exit = "exit"
let failure = "Failure"
let invalidArgument = "Invalid_argument"
let jsExnError = "Js.Exn.Error"
let jsExnError = "Exn.Error"
let matchFailure = "Match_failure"
let notFound = "Not_found"
let sysError = "Sys_error"
Expand Down
204 changes: 66 additions & 138 deletions analysis/reanalyze/src/ExnLib.ml
Original file line number Diff line number Diff line change
@@ -1,19 +1,6 @@
let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
let table = Hashtbl.create 15 in
let open Exn in
let array =
[
("get", [invalidArgument]);
("set", [invalidArgument]);
("make", [invalidArgument]);
("init", [invalidArgument]);
("make_matrix", [invalidArgument]);
("fill", [invalidArgument]);
("blit", [invalidArgument]);
("iter2", [invalidArgument]);
("map2", [invalidArgument]);
]
in
let beltArray = [("getExn", [assertFailure]); ("setExn", [assertFailure])] in
let beltList =
[("getExn", [notFound]); ("headExn", [notFound]); ("tailExn", [notFound])]
Expand Down Expand Up @@ -49,91 +36,10 @@ let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
("either", [decodeError]);
]
in
let buffer =
[
("sub", [invalidArgument]);
("blit", [invalidArgument]);
("nth", [invalidArgument]);
("add_substitute", [notFound]);
("add_channel", [endOfFile]);
("truncate", [invalidArgument]);
]
in
let bytes =
[
("get", [invalidArgument]);
("set", [invalidArgument]);
("create", [invalidArgument]);
("make", [invalidArgument]);
("init", [invalidArgument]);
("sub", [invalidArgument]);
("sub_string", [invalidArgument]);
("extend", [invalidArgument]);
("fill", [invalidArgument]);
("blit", [invalidArgument]);
("blit_string", [invalidArgument]);
(* ("concat", [invalidArgument]), if longer than {!Sys.max_string_length}
("cat", [invalidArgument]), if longer than {!Sys.max_string_length}
("escaped", [invalidArgument]), if longer than {!Sys.max_string_length} *)
("index", [notFound]);
("rindex", [notFound]);
("index_from", [invalidArgument; notFound]);
("index_from_opt", [invalidArgument]);
("rindex_from", [invalidArgument; notFound]);
("rindex_from_opt", [invalidArgument]);
("contains_from", [invalidArgument]);
("rcontains_from", [invalidArgument]);
]
in
let filename =
[
("chop_extension", [invalidArgument]);
("temp_file", [sysError]);
("open_temp_file", [sysError]);
]
in
let hashtbl = [("find", [notFound])] in
let list =
[
("hd", [failure]);
("tl", [failure]);
("nth", [failure; invalidArgument]);
("nth_opt", [invalidArgument]);
("init", [invalidArgument]);
("iter2", [invalidArgument]);
("map2", [invalidArgument]);
("fold_left2", [invalidArgument]);
("fold_right2", [invalidArgument]);
("for_all2", [invalidArgument]);
("exists2", [invalidArgument]);
("find", [notFound]);
("assoc", [notFound]);
("combine", [invalidArgument]);
]
in
let string =
[
("get", [invalidArgument]);
("set", [invalidArgument]);
("create", [invalidArgument]);
("make", [invalidArgument]);
("init", [invalidArgument]);
("sub", [invalidArgument]);
("fill", [invalidArgument]);
(* ("concat", [invalidArgument]), if longer than {!Sys.max_string_length}
("escaped", [invalidArgument]), if longer than {!Sys.max_string_length} *)
("index", [notFound]);
("rindex", [notFound]);
("index_from", [invalidArgument; notFound]);
("index_from_opt", [invalidArgument]);
("rindex_from", [invalidArgument; notFound]);
("rindex_from_opt", [invalidArgument]);
("contains_from", [invalidArgument]);
("rcontains_from", [invalidArgument]);
]
in
let stdlib =
[
("panic", [jsExnError]);
("assertEqual", [jsExnError]);
("invalid_arg", [invalidArgument]);
("failwith", [failure]);
("/", [divisionByZero]);
Expand All @@ -142,29 +48,40 @@ let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
("bool_of_string", [invalidArgument]);
("int_of_string", [failure]);
("float_of_string", [failure]);
("read_int", [failure]);
("output", [invalidArgument]);
("close_out", [sysError]);
("input_char", [endOfFile]);
("input_line", [endOfFile]);
("input", [invalidArgument]);
("really_input", [endOfFile; invalidArgument]);
("really_input_string", [endOfFile]);
("input_byte", [endOfFile]);
("input_binary_int", [endOfFile]);
("close_in", [sysError]);
("exit", [exit]);
]
in
let str =
let stdlibBigInt = [("fromStringExn", [jsExnError])] in
let stdlibError = [("raise", [jsExnError])] in
let stdlibExn =
[
("raiseError", [jsExnError]);
("raiseEvalError", [jsExnError]);
("raiseRangeError", [jsExnError]);
("raiseReferenceError", [jsExnError]);
("raiseSyntaxError", [jsExnError]);
("raiseTypeError", [jsExnError]);
("raiseUriError", [jsExnError]);
]
in
let stdlibJson =
[
("search_forward", [notFound]);
("search_backward", [notFound]);
("matched_group", [notFound]);
("group_beginning", [notFound; invalidArgument]);
("group_end", [notFound; invalidArgument]);
("parseExn", [jsExnError]);
("parseExnWithReviver", [jsExnError]);
("stringifyAny", [jsExnError]);
("stringifyAnyWithIndent", [jsExnError]);
("stringifyAnyWithReplacer", [jsExnError]);
("stringifyAnyWithReplacerAndIndent", [jsExnError]);
("stringifyAnyWithFilter", [jsExnError]);
("stringifyAnyWithFilterAndIndent", [jsExnError]);
]
in
let stdlibList =
[("headExn", [notFound]); ("tailExn", [notFound]); ("getExn", [notFound])]
in
let stdlibNull = [("getExn", [invalidArgument])] in
let stdlibNullable = [("getExn", [invalidArgument])] in
let stdlibOption = [("getExn", [jsExnError])] in
let stdlibResult = [("getExn", [notFound])] in
let yojsonBasic = [("from_string", [yojsonJsonError])] in
let yojsonBasicUtil =
[
Expand All @@ -183,7 +100,6 @@ let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
]
in
[
("Array", array);
("Belt.Array", beltArray);
("Belt_Array", beltArray);
("Belt.List", beltList);
Expand All @@ -206,6 +122,11 @@ let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
("Belt_MutableMapString", beltMutableMap);
("Belt.MutableQueue", beltMutableQueue);
("Belt_MutableQueue", beltMutableQueue);
("Belt_MutableSetInt", beltMutableSet);
("Belt_MutableSetString", beltMutableSet);
("Belt.MutableSet", beltMutableSet);
("Belt.MutableSet.Int", beltMutableSet);
("Belt.MutableSet.String", beltMutableSet);
("Belt.Option", beltOption);
("Belt_Option", beltOption);
("Belt.Result", beltResult);
Expand All @@ -218,35 +139,42 @@ let raisesLibTable : (Name.t, Exceptions.t) Hashtbl.t =
("Belt_Set.String", beltSet);
("Belt_SetInt", beltSet);
("Belt_SetString", beltSet);
("Belt.MutableSet", beltMutableSet);
("Belt.MutableSet.Int", beltMutableSet);
("Belt.MutableSet.String", beltMutableSet);
("MutableSet", beltMutableSet);
("MutableSet.Int", beltMutableSet);
("MutableSet.String", beltMutableSet);
("Belt_MutableSetInt", beltMutableSet);
("Belt_MutableSetString", beltMutableSet);
("Buffer", buffer);
("Bytes", bytes);
("BigInt", stdlibBigInt);
("Char", [("chr", [invalidArgument])]);
("Filename", filename);
("Hashtbl", hashtbl);
("Error", stdlibError);
("Exn", stdlibExn);
("Js.Json", [("parseExn", [jsExnError])]);
("JSON", stdlibJson);
("Json_decode", bsJson);
("Json.Decode", bsJson);
("List", list);
("List", stdlibList);
("MutableSet", beltMutableSet);
("MutableSet.Int", beltMutableSet);
("MutableSet.String", beltMutableSet);
("Null", stdlibNull);
("Nullable", stdlibNullable);
("Option", stdlibOption);
("Pervasives", stdlib);
("Result", stdlibResult);
("Stdlib", stdlib);
("Stdlib.Array", array);
("Stdlib.Buffer", buffer);
("Stdlib.Bytes", bytes);
("Stdlib.Filename", filename);
("Stdlib.Hashtbl", hashtbl);
("Stdlib.List", list);
("Stdlib.Str", str);
("Stdlib.String", string);
("Str", str);
("String", string);
("Stdlib_BigInt", stdlibBigInt);
("Stdlib.BigInt", stdlibBigInt);
("Stdlib_Error", stdlibError);
("Stdlib.Error", stdlibError);
("Stdlib_Exn", stdlibExn);
("Stdlib.Exn", stdlibExn);
("Stdlib_JSON", stdlibJson);
("Stdlib.JSON", stdlibJson);
("Stdlib_List", stdlibList);
("Stdlib.List", stdlibList);
("Stdlib_Null", stdlibNull);
("Stdlib.Null", stdlibNull);
("Stdlib_Nullable", stdlibNullable);
("Stdlib.Nullable", stdlibNullable);
("Stdlib_Option", stdlibOption);
("Stdlib.Option", stdlibOption);
("Stdlib_Result", stdlibResult);
("Stdlib.Result", stdlibResult);
("Yojson.Basic", yojsonBasic);
("Yojson.Basic.Util", yojsonBasicUtil);
]
Expand Down
28 changes: 10 additions & 18 deletions runtime/Stdlib_BigInt.res
Original file line number Diff line number Diff line change
Expand Up @@ -16,26 +16,20 @@ number as a `bigint` if successfully parsed. Uncaught syntax exception otherwise
## Examples

```rescript
/* returns 123n */
BigInt.fromStringExn("123")
BigInt.fromStringExn("123")->assertEqual(123n)

/* returns 0n */
BigInt.fromStringExn("")
BigInt.fromStringExn("")->assertEqual(0n)

/* returns 17n */
BigInt.fromStringExn("0x11")
BigInt.fromStringExn("0x11")->assertEqual(17n)

/* returns 3n */
BigInt.fromStringExn("0b11")
BigInt.fromStringExn("0b11")->assertEqual(3n)

/* returns 9n */
BigInt.fromStringExn("0o11")
BigInt.fromStringExn("0o11")->assertEqual(9n)

/* catch exception */
try {
BigInt.fromStringExn("a")
} catch {
| Exn.Error(_error) => 0n
switch BigInt.fromStringExn("a") {
| exception Exn.Error(_error) => assert(true)
| _bigInt => assert(false)
}
```
*/
Expand All @@ -51,8 +45,7 @@ See [`toString`](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Referen
## Examples

```rescript
/* prints "123" */
BigInt.toString(123n)->Console.log
BigInt.toString(123n)->assertEqual("123")
```
*/
external toString: (bigint, ~radix: int=?) => string = "toString"
Expand All @@ -67,8 +60,7 @@ Returns a string with a language-sensitive representation of this BigInt value.
## Examples

```rescript
/* prints "123" */
BigInt.toString(123n)->Console.log
BigInt.toString(123n)->assertEqual("123")
```
*/
external toLocaleString: bigint => string = "toLocaleString"
Expand Down
Loading
Loading