Skip to content

classify js bigint type correctly #5351

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.

Sign up for GitHub

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

Merged
cristianoc merged 4 commits into from
Jun 30, 2022
Merged

classify js bigint type correctly #5351

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
086b02a
js: classify bigint type correctly
cometkim Jun 8, 2022
4012fd4
reorder cases
cometkim Jun 30, 2022
198563f
Generated files.
cristianoc Jun 30, 2022
fefd3f9
Update Changes.md
cristianoc Jun 30, 2022
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
25 changes: 17 additions & 8 deletions jscomp/others/js_types.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
type symbol
(** Js symbol type only available in ES6 *)

type bigint_val
(** Js bigint type only available in ES2020 *)

type obj_val
type undefined_val
(** This type has only one value `undefined` *)
Expand All @@ -45,6 +48,7 @@ type _ t =
| Function : function_val t
| Object : obj_val t
| Symbol : symbol t
| BigInt : bigint_val t



Expand All @@ -58,6 +62,7 @@ type tagged_t =
| JSFunction of function_val
| JSObject of obj_val
| JSSymbol of symbol
| JSBigInt of bigint_val

let classify (x : 'a) : tagged_t =
let ty = Js.typeof x in
Expand All @@ -66,18 +71,20 @@ let classify (x : 'a) : tagged_t =
if x == (Obj.magic Js_null.empty) then
JSNull else
if ty = "number" then
JSNumber (Obj.magic x ) else
JSNumber (Obj.magic x) else
if ty = "bigint" then
JSBigInt (Obj.magic x) else
if ty = "string" then
JSString (Obj.magic x) else
if ty = "boolean" then
if (Obj.magic x) = true then JSTrue
if (Obj.magic x) = true then JSTrue
else JSFalse else
if ty = "symbol" then
JSSymbol (Obj.magic x) else
if ty = "function" then
JSFunction (Obj.magic x) else
if ty = "object" then
JSObject (Obj.magic x)
JSFunction (Obj.magic x)
else
JSSymbol (Obj.magic x)
JSObject (Obj.magic x)


let test (type a) (x : 'a) (v : a t) : bool =
Expand Down Expand Up @@ -105,5 +112,7 @@ let test (type a) (x : 'a) (v : a t) : bool =
Js.typeof x = "object"
| Symbol
->
Js.typeof x = "symbol"

Js.typeof x = "symbol"
| BigInt
->
Js.typeof x = "bigint"
5 changes: 5 additions & 0 deletions jscomp/others/js_types.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@
type symbol
(** Js symbol type (only available in ES6) *)

type bigint_val
(** Js bigint type only available in ES2020 *)

type obj_val

type undefined_val
Expand All @@ -46,6 +49,7 @@ type _ t =
| Function : function_val t
| Object : obj_val t
| Symbol : symbol t
| BigInt : bigint_val t

val test : 'a -> 'b t -> bool
(**
Expand All @@ -69,5 +73,6 @@ type tagged_t =
| JSFunction of function_val
| JSObject of obj_val
| JSSymbol of symbol
| JSBigInt of bigint_val

val classify : 'a -> tagged_t
3 changes: 2 additions & 1 deletion jscomp/test/typeof_test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,8 @@ let string_or_number (type t) x =
| JSFalse | JSTrue -> false
| JSFunction _ -> Js.log ("Function"); false
| JSObject _ -> false
| JSSymbol _ -> false
| JSSymbol _ -> false
| JSBigInt _ -> false

let suites = Mt.[
"int_type", (fun _ -> Eq(Js.typeof 3, "number") );
Expand Down