Merge pull request #1062 from chenglou/fix-mli

Expose Js_(null|undefined|null_undefined).from_opt in mli

Author: bobzhang

jscomp/others/js_null_undefined.mli

@@ -1,5 +1,5 @@
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -17,7 +17,7 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
@@ -28,8 +28,9 @@ external return : 'a -> 'a t = "%identity"
 external test : 'a t -> bool =  "js_is_nil_undef"
 external empty : 'a t = "undefined" [@@bs.val]
 
-(** we did not add [bind] yet, since the return value is 
+(** we did not add [bind] yet, since the return value is
     ambiguous and [to_opt] depends on {!Js_primitive}
 *)
 val bind : 'a t -> ('a -> 'b [@bs]) -> 'b t
 val iter : 'a t -> ('a -> unit [@bs]) -> unit
+val from_opt : 'a option -> 'a t

jscomp/runtime/js_null.mli

@@ -30,3 +30,4 @@ external empty : 'a t = "null" [@@bs.val]
 
 val bind : 'a t -> ('a -> 'b [@bs]) -> 'b t
 val iter : 'a t -> ('a -> unit [@bs]) -> unit
+val from_opt : 'a option -> 'a t

jscomp/runtime/js_undefined.mli

@@ -1,5 +1,5 @@
 (* Copyright (C) 2015-2016 Bloomberg Finance L.P.
- * 
+ *
  * This program is free software: you can redistribute it and/or modify
  * it under the terms of the GNU Lesser General Public License as published by
  * the Free Software Foundation, either version 3 of the License, or
@@ -17,17 +17,18 @@
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *)
 
-type + 'a t = 'a Js.undefined 
+type + 'a t = 'a Js.undefined
 external to_opt : 'a t -> 'a option = "js_from_def"
 external return : 'a -> 'a t = "%identity"
 external test : 'a t -> bool =  "js_is_undef"
-external empty : 'a t = "undefined" 
+external empty : 'a t = "undefined"
 [@@bs.val]
 
 val bind : 'a t -> ('a -> 'b [@bs]) -> 'b t
 val iter : 'a t -> ('a -> unit [@bs]) -> unit
+val from_opt : 'a option -> 'a t

lib/js/js_null.js

@@ -19,6 +19,16 @@ function iter(x, f) {
   }
 }
 
-exports.bind = bind;
-exports.iter = iter;
+function from_opt(x) {
+  if (x) {
+    return x[0];
+  }
+  else {
+    return null;
+  }
+}
+
+exports.bind     = bind;
+exports.iter     = iter;
+exports.from_opt = from_opt;
 /* No side effect */

lib/js/js_null_undefined.js

@@ -20,6 +20,16 @@ function iter(x, f) {
   }
 }
 
-exports.bind = bind;
-exports.iter = iter;
+function from_opt(x) {
+  if (x) {
+    return x[0];
+  }
+  else {
+    return undefined;
+  }
+}
+
+exports.bind     = bind;
+exports.iter     = iter;
+exports.from_opt = from_opt;
 /* No side effect */

lib/js/js_undefined.js

@@ -19,6 +19,16 @@ function iter(x, f) {
   }
 }
 
-exports.bind = bind;
-exports.iter = iter;
+function from_opt(x) {
+  if (x) {
+    return x[0];
+  }
+  else {
+    return undefined;
+  }
+}
+
+exports.bind     = bind;
+exports.iter     = iter;
+exports.from_opt = from_opt;
 /* No side effect */