remove Js booleans

Author: bobzhang

jscomp/build_tests/bucklescript-tea/src/tea_json.ml

@@ -532,7 +532,7 @@ module Encoder = struct
 
   let float (v : float) = Json.of_type Json.Number v
 
-  let bool (v : bool) = Json.of_type Json.Boolean (if v then Js.true_ else Js.false_)
+  let bool (v : bool) = Json.of_type Json.Boolean v
 
   let null = Json.of_type Json.Null Json.null
 

jscomp/others/.depend

@@ -86,7 +86,6 @@ belt_SetString.cmj : belt_internalSetString.cmj belt_internalAVLset.cmj \
 belt_MutableStack.cmj : belt_MutableStack.cmi
 belt_MutableQueue.cmj : belt_Array.cmj belt_MutableQueue.cmi
 node_child_process.cmj : node.cmj
-js_boolean.cmj : js_boolean.cmi
 js_math.cmj :
 js_dict.cmj : js_array.cmj js_dict.cmi
 js_date.cmj :
@@ -146,7 +145,6 @@ belt_SetInt.cmi :
 belt_SetString.cmi :
 belt_MutableStack.cmi :
 belt_MutableQueue.cmi :
-js_boolean.cmi :
 js_dict.cmi :
 js_cast.cmi :
 dom.cmi : dom_storage.cmi

jscomp/others/Makefile

@@ -51,7 +51,7 @@ SOURCE_LIST= node_path node_fs node_process dict node_module js_array js_string
 	belt_MutableStack\
 	belt_MutableQueue\
 	node_child_process \
-	js_boolean js_math\
+	js_math\
 	js_dict js_date js_global js_cast js_promise\
 	dom dom_storage\
 	belt_HashMapInt\

jscomp/others/js_boolean.ml

@@ -41,8 +41,6 @@ let out_ident ppf s =
       -> "Js.Array"
     | "Js_string"
       -> "Js.String"
-    | "Js_boolean" 
-      -> "Js.Boolean"
     | "Js_re" 
       -> "Js.Re"
     | "Js_promise"

jscomp/others/js_boolean.mli

@@ -81,7 +81,7 @@ var cmi_files =
         // `lazy`,
         `js`, `js_unsafe`, `js_re`, `js_array`, `js_null`, `js_undefined`, `js_internal`,
         `js_types`, `js_null_undefined`, `js_dict`, `js_exn`, `js_string`, `js_vector`,
-        `js_boolean`, `js_date`, `js_global`, `js_math`, `js_obj`, `js_int`,
+        `js_date`, `js_global`, `js_math`, `js_obj`, `js_int`,
         `js_result`, `js_list`, `js_typed_array`,
         `js_promise`, `js_option`, `js_float`, `js_json`,
         `arrayLabels`, `bytesLabels`, `complex`, `gc`, `genlex`, `listLabels`,

jscomp/outcome_printer/outcome_printer_ns.ml

@@ -67,8 +67,6 @@ external nullToOption : 'a null -> 'a option = "#null_to_opt"
 external test : 'a nullable -> bool = "#is_nil_undef"
 external testAny : 'a -> bool = "#is_nil_undef"
 
-type boolean = bool
-(** The JS boolean type, can be [Js.true_] or [Js.false_] *)
 
 (* I'd like to move this and the other types into a Js_core module that can be
    included back here, but the dependency hackery confuses me *)
@@ -79,16 +77,15 @@ type (+'a, +'e) promise
 
 
 (* tag::predefined_js_values[]*)
-let true_ : boolean = true
-let false_ : boolean = false
+
 external null : 'a null = "#null"
 (* The same as {!Js.Null.empty} will be compiled as [null]*)
 external undefined : 'a undefined = "#undefined"
 (* The same as  {!Js.Undefined.empty} will be compiled as [undefined]*)
 (* end::predefined_js_values[]*)
 
 (* tag::utility_functions[]*)
-external to_bool : boolean -> bool = "%identity"
+
 external typeof : 'a -> string = "#typeof"
 (** [typeof x] will be compiled as [typeof x] in JS *)
 external log : 'a -> unit = "log" 
@@ -134,7 +131,6 @@ module Exn = Js_exn
   {! Js_dict}, {! Js_array}, {! Js_string} and {! Js_re} for more details *)
 
 module Array = Js_array
-module Boolean = Js_boolean
 module Date = Js_date
 module Dict = Js_dict
 module Global = Js_global

jscomp/repl.js

@@ -82,34 +82,19 @@ external test : 'a nullable -> bool = "#is_nil_undef"
 (** The same as {!test} except that it is more permissive on the types of input *)
 external testAny : 'a -> bool = "#is_nil_undef"
 
-type boolean = bool
-[@@ocaml.deprecated "Use type bool instead"]
-(** The value could be either  {!Js.true_} or {!Js.false_}.
-     Note in BuckleScript, [boolean] has different representation from OCaml's [bool],
-     see conversion functions in {!Boolean} *)
 
 type (+'a, +'e) promise
 (** The promise type, defined here for interoperation across packages 
     @deprecated please use {!Js.Promise}
 *)
 
-
-val true_ : bool
-[@@ocaml.deprecated "Use true directly"]
-
-val false_ : bool
-[@@ocaml.deprecated "Use false directly"]
-
 external null : 'a null = "#null" 
 (** The same as [empty] in {!Js.Null} will be compiled as [null]*)
 
 external undefined : 'a undefined = "#undefined" 
 (** The same as  [empty] {!Js.Undefined} will be compiled as [undefined]*)
 
 
-external to_bool : bool -> bool = "%identity"
-[@@ocaml.deprecated "This function is not needed any more"]
-(** convert Js boolean to OCaml bool *)
 
 external typeof : 'a -> string = "#typeof"
 (** [typeof x] will be compiled as [typeof x] in JS 
@@ -172,8 +157,6 @@ module Array = Js_array
 (** Provide bindings to Js array*)
 module String = Js_string
 (** Provide bindings to JS string *)
-module Boolean = Js_boolean
-(** Provide utilities for {!boolean} *)
 
 module Re = Js_re
 (** Provide bindings to Js regex expression *)

jscomp/runtime/js.ml

@@ -1661,7 +1661,7 @@ let keydown evt =
   | 40 | 83 -> pressed_keys.down <- true
   | 66 -> pressed_keys.bbox <- (pressed_keys.bbox + 1) mod 2
   | _ -> ()
-  in Js.true_
+  in true
 
 (* Keyup event handler translates a key release *)
 let keyup evt =
@@ -1672,7 +1672,7 @@ let keyup evt =
   | 37 | 65 -> pressed_keys.left <- false
   | 40 | 83 -> pressed_keys.down <- false
   | _ -> ()
-  in Js.true_
+  in true
 
 end
 module Procedural_generator : sig 
@@ -2012,8 +2012,8 @@ let load _ =
     | Some el -> Dom_html.elementToCanvasElement el
   in
   let context = (Dom_html.canvasElementToJsObj canvas)##getContext "2d" in
-  let _ = Dom_html.addEventListener Dom_html.document "keydown" (Director.keydown) Js.true_ in
-  let _ = Dom_html.addEventListener Dom_html.document "keyup" (Director.keyup) Js.true_ in
+  let _ = Dom_html.addEventListener Dom_html.document "keydown" (Director.keydown) true in
+  let _ = Dom_html.addEventListener Dom_html.document "keyup" (Director.keyup) true in
   let () = Pg.init () in
   let _ = Director.update_loop canvas (Pg.generate level_width level_height context) (level_width,level_height) in
   print_endline "asd";
@@ -2032,9 +2032,9 @@ let preload _ =
     let img = (Html.createImg Dom_html.document) in
     (Dom_html.imageElementToJsObj img)##src #= (img_src) ;
     ignore(Dom_html.addEventListenerImg  img "load"
-    ( (fun ev ->  inc_counter(); Js.true_)) Js.true_)) imgs
+    ( (fun ev ->  inc_counter(); true)) true)) imgs
 
 
-let _ = (Dom_html.windowToJsObj Dom_html.window)##onload #= (fun _ -> ignore (preload()); Js.true_)
+let _ = (Dom_html.windowToJsObj Dom_html.window)##onload #= (fun _ -> ignore (preload()); true)
 
 end

jscomp/runtime/js.mli

@@ -5,10 +5,6 @@ var MapperRt = 0;
 
 var Internal = 0;
 
-var true_ = true;
-
-var false_ = false;
-
 var Null = 0;
 
 var Undefined = 0;
@@ -23,8 +19,6 @@ var $$Array = 0;
 
 var $$String = 0;
 
-var $$Boolean = 0;
-
 var Re = 0;
 
 var Promise = 0;
@@ -61,16 +55,13 @@ var Console = 0;
 
 exports.MapperRt = MapperRt;
 exports.Internal = Internal;
-exports.true_ = true_;
-exports.false_ = false_;
 exports.Null = Null;
 exports.Undefined = Undefined;
 exports.Nullable = Nullable;
 exports.Null_undefined = Null_undefined;
 exports.Exn = Exn;
 exports.$$Array = $$Array;
 exports.$$String = $$String;
-exports.$$Boolean = $$Boolean;
 exports.Re = Re;
 exports.Promise = Promise;
 exports.$$Date = $$Date;

jscomp/test/mario_game.ml

@@ -75550,7 +75550,7 @@ let if_ (a : t) (b : t) c =
   end 
 
 
-
+(** TODO: the smart constructor is not exploited yet*)
 (** [l || r ] *)
 let sequor l r = if_ l true_ r
 
@@ -117137,8 +117137,6 @@ let out_ident ppf s =
       -> "Js.Array"
     | "Js_string"
       -> "Js.String"
-    | "Js_boolean" 
-      -> "Js.Boolean"
     | "Js_re" 
       -> "Js.Re"
     | "Js_promise"