Skip to content

Undo removal of Js.Null.to_opt #2516

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
merged 1 commit into from
Feb 14, 2018
Merged

Undo removal of Js.Null.to_opt #2516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 jscomp/runtime/js_null.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@

type + 'a t = 'a Js.null

external to_opt : 'a t -> 'a option = "#null_to_opt"
external toOption : 'a t -> 'a option = "#null_to_opt"
external return : 'a -> 'a t = "%identity"
external test : 'a t -> bool = "#is_nil"
Expand Down
5 changes: 4 additions & 1 deletion jscomp/runtime/js_null.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ val iter : 'a t -> ('a -> unit [@bs]) -> unit
val fromOption: 'a option -> 'a t

val from_opt : 'a option -> 'a t
[@@ocaml.deprecated "Use fromOpiton instead"]
[@@ocaml.deprecated "Use fromOption instead"]

(** Maps ['a Js.null] to ['a option]

Expand All @@ -91,4 +91,7 @@ val from_opt : 'a option -> 'a t
*)
external toOption : 'a t -> 'a option = "#null_to_opt"

external to_opt : 'a t -> 'a option = "#null_to_opt"
[@@ocaml.deprecated "Use toOption instead"]


43 changes: 43 additions & 0 deletions jscomp/test/js_null.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
'use strict';


function getExn(f) {
if (f !== null) {
return f;
} else {
throw new Error("Js.Null.getExn");
}
}

function bind(x, f) {
if (x !== null) {
return f(x);
} else {
return null;
}
}

function iter(x, f) {
if (x !== null) {
return f(x);
} else {
return /* () */0;
}
}

function fromOption(x) {
if (x) {
return x[0];
} else {
return null;
}
}

var from_opt = fromOption;

exports.getExn = getExn;
exports.bind = bind;
exports.iter = iter;
exports.fromOption = fromOption;
exports.from_opt = from_opt;
/* No side effect */
112 changes: 67 additions & 45 deletions jscomp/test/js_null_test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,109 +27,131 @@ var suites_001 = /* :: */[
],
/* :: */[
/* tuple */[
"return",
"toOption - empty",
(function () {
return /* Eq */Block.__(0, [
/* Some */["something"],
Js_primitive.null_to_opt("something")
/* None */0,
null === null ? /* None */0 : [null]
]);
})
],
/* :: */[
/* tuple */[
"test - empty",
"toOption - 'a",
(function () {
return /* Eq */Block.__(0, [
/* true */1,
+(null === null)
/* Some */[/* () */0],
Js_primitive.null_to_opt(/* () */0)
]);
})
],
/* :: */[
/* tuple */[
"test - 'a",
"return",
(function () {
return /* Eq */Block.__(0, [
/* false */0,
/* false */0
/* Some */["something"],
Js_primitive.null_to_opt("something")
]);
})
],
/* :: */[
/* tuple */[
"bind - empty",
"test - empty",
(function () {
return /* StrictEq */Block.__(2, [
null,
Js_null.bind(null, (function (v) {
return v;
}))
return /* Eq */Block.__(0, [
/* true */1,
+(null === null)
]);
})
],
/* :: */[
/* tuple */[
"bind - 'a",
"test - 'a",
(function () {
return /* StrictEq */Block.__(2, [
4,
Js_null.bind(2, (function (n) {
return (n << 1);
}))
return /* Eq */Block.__(0, [
/* false */0,
/* false */0
]);
})
],
/* :: */[
/* tuple */[
"iter - empty",
"bind - empty",
(function () {
var hit = [/* false */0];
Js_null.iter(null, (function () {
hit[0] = /* true */1;
return /* () */0;
}));
return /* Eq */Block.__(0, [
/* false */0,
hit[0]
return /* StrictEq */Block.__(2, [
null,
Js_null.bind(null, (function (v) {
return v;
}))
]);
})
],
/* :: */[
/* tuple */[
"iter - 'a",
"bind - 'a",
(function () {
var hit = [0];
Js_null.iter(2, (function (v) {
hit[0] = v;
return /* () */0;
}));
return /* Eq */Block.__(0, [
2,
hit[0]
return /* StrictEq */Block.__(2, [
4,
Js_null.bind(2, (function (n) {
return (n << 1);
}))
]);
})
],
/* :: */[
/* tuple */[
"from_opt - None",
"iter - empty",
(function () {
var hit = [/* false */0];
Js_null.iter(null, (function () {
hit[0] = /* true */1;
return /* () */0;
}));
return /* Eq */Block.__(0, [
null,
Js_null.fromOption(/* None */0)
/* false */0,
hit[0]
]);
})
],
/* :: */[
/* tuple */[
"from_opt - Some",
"iter - 'a",
(function () {
var hit = [0];
Js_null.iter(2, (function (v) {
hit[0] = v;
return /* () */0;
}));
return /* Eq */Block.__(0, [
2,
Js_null.fromOption(/* Some */[2])
hit[0]
]);
})
],
/* [] */0
/* :: */[
/* tuple */[
"fromOption - None",
(function () {
return /* Eq */Block.__(0, [
null,
Js_null.fromOption(/* None */0)
]);
})
],
/* :: */[
/* tuple */[
"fromOption - Some",
(function () {
return /* Eq */Block.__(0, [
2,
Js_null.fromOption(/* Some */[2])
]);
})
],
/* [] */0
]
]
]
]
]
Expand Down
10 changes: 6 additions & 4 deletions jscomp/test/js_null_test.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
open Js_null

let suites = Mt.[
"to_opt - empty", (fun _ -> Eq(None, empty |> toOption));
"to_opt - 'a", (fun _ -> Eq(Some (), return () |> toOption));
"to_opt - empty", (fun _ -> Eq(None, empty |> to_opt));
"to_opt - 'a", (fun _ -> Eq(Some (), return () |> to_opt));
"toOption - empty", (fun _ -> Eq(None, empty |> toOption));
"toOption - 'a", (fun _ -> Eq(Some (), return () |> toOption));
"return", (fun _ -> Eq(Some "something", return "something" |> toOption));
"test - empty", (fun _ -> Eq(true, empty |> test));
"test - 'a", (fun _ -> Eq(false, return () |> test));
Expand All @@ -18,7 +20,7 @@ let suites = Mt.[
let _ = iter (return 2) ((fun v -> hit := v) [@bs]) in
Eq(2, !hit)
);
"from_opt - None", (fun _ -> Eq(empty, None |> fromOption));
"from_opt - Some", (fun _ -> Eq(return 2, Some 2 |> fromOption));
"fromOption - None", (fun _ -> Eq(empty, None |> fromOption));
"fromOption - Some", (fun _ -> Eq(return 2, Some 2 |> fromOption));
]
;; Mt.from_pair_suites __FILE__ suites