Remove implicit polymorphic calls

compiler/compileArg.ml

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
+open! Js_of_ocaml_compiler.Stdlib
 open Js_of_ocaml_compiler
-open Js_of_ocaml_compiler.Stdlib
 open Cmdliner
 
 type t =
@@ -248,7 +248,7 @@ let options =
       else None
     in
     let source_map =
-      if source_map <> None && not Source_map_io.enabled
+      if Option.is_some source_map && not Source_map_io.enabled
       then (
         warn
           "Warning: '--source-map' flag ignored because js_of_ocaml was compiled \

compiler/js_of_ocaml.ml

@@ -18,8 +18,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
+open! Js_of_ocaml_compiler.Stdlib
 open Js_of_ocaml_compiler
-open Js_of_ocaml_compiler.Stdlib
 
 let times = Debug.find "times"
 
@@ -133,14 +133,16 @@ let f
   in
   if times () then Format.eprintf "Start parsing...@.";
   let need_debug =
-    if source_map <> None || Config.Flag.debuginfo () || toplevel
+    if Option.is_some source_map || Config.Flag.debuginfo () || toplevel
     then `Full
     else if Config.Flag.pretty ()
     then `Names
     else `No
   in
   let check_debug debug =
-    if (not runtime_only) && source_map <> None && Parse_bytecode.Debug.is_empty debug
+    if (not runtime_only)
+       && Option.is_some source_map
+       && Parse_bytecode.Debug.is_empty debug
     then
       warn
         "Warning: '--source-map' is enabled but the bytecode program was compiled with \
@@ -260,7 +262,7 @@ let f
           | (`Stdout, _), false -> `Stdout
           | (`Name x, _), false -> `Name x
           | (`Name x, true), true
-            when String.length x > 0 && x.[String.length x - 1] = '/' ->
+            when String.length x > 0 && Char.equal x.[String.length x - 1] '/' ->
               `Name (gen_unit_filename x cmo)
           | (`Name _, true), true | (`Stdout, true), true ->
               failwith "use [-o dirname/] or remove [--keep-unit-names]"
@@ -277,8 +279,8 @@ let f
               match output_file with
               | `Stdout, false -> `Name (gen_unit_filename "./" cmo)
               | `Name x, false -> `Name (gen_unit_filename (Filename.dirname x) cmo)
-              | `Name x, true when String.length x > 0 && x.[String.length x - 1] = '/'
-                ->
+              | `Name x, true
+                when String.length x > 0 && Char.equal x.[String.length x - 1] '/' ->
                   `Name (gen_unit_filename x cmo)
               | `Stdout, true | `Name _, true ->
                   failwith "use [-o dirname/] or remove [--keep-unit-names]"

compiler/jsoo_link.ml

@@ -17,6 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
+open! Js_of_ocaml_compiler.Stdlib
 open Js_of_ocaml_compiler
 
 let f {LinkerArg.output_file; source_map; resolve_sourcemap_url; js_files} =

compiler/jsoo_minify.ml

@@ -17,8 +17,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
+open! Js_of_ocaml_compiler.Stdlib
 open Js_of_ocaml_compiler
-open Js_of_ocaml_compiler.Stdlib
 
 let error k = Format.ksprintf (fun s -> failwith s) k
 

compiler/lib/base64.ml

@@ -19,6 +19,8 @@
  *
  *)
 
+open! Stdlib
+
 type ('a, 'b) result =
   | Ok of 'a
   | Error of 'b
@@ -51,9 +53,9 @@ let make_alphabet alphabet =
   if String.length alphabet <> 64 then invalid_arg "Length of alphabet must be 64";
   if String.contains alphabet '='
   then invalid_arg "Alphabet can not contain padding character";
-  let emap = Array.init (String.length alphabet) (fun i -> Char.code alphabet.[i]) in
+  let emap = Array.init (String.length alphabet) ~f:(fun i -> Char.code alphabet.[i]) in
   let dmap = Array.make 256 none in
-  String.iteri (fun idx chr -> dmap.(Char.code chr) <- idx) alphabet;
+  String.iteri ~f:(fun idx chr -> dmap.(Char.code chr) <- idx) alphabet;
   {emap; dmap}
 
 let length_alphabet {emap; _} = Array.length emap
@@ -146,7 +148,7 @@ let encode_sub pad {emap; _} ?(off = 0) ?len input =
 
 let encode ?(pad = true) ?(alphabet = default_alphabet) ?off ?len input =
   match encode_sub pad alphabet ?off ?len input with
-  | Ok (res, off, len) -> Ok (String.sub res off len)
+  | Ok (res, off, len) -> Ok (String.sub res ~pos:off ~len)
   | Error _ as err -> err
 
 let encode_string ?pad ?alphabet input =
@@ -284,7 +286,7 @@ let decode_sub ?(pad = true) {dmap; _} ?(off = 0) ?len input =
 
 let decode ?pad ?(alphabet = default_alphabet) ?off ?len input =
   match decode_sub ?pad alphabet ?off ?len input with
-  | Ok (res, off, len) -> Ok (String.sub res off len)
+  | Ok (res, off, len) -> Ok (String.sub res ~pos:off ~len)
   | Error _ as err -> err
 
 let decode_sub ?pad ?(alphabet = default_alphabet) ?off ?len input =

compiler/lib/build_path_prefix_map.ml

@@ -13,7 +13,7 @@
 (*                                                                        *)
 (**************************************************************************)
 
-open Stdlib
+open! Stdlib
 
 type path = string
 
@@ -107,11 +107,7 @@ let decode_map str =
 let rewrite_opt prefix_map path =
   let is_prefix = function
     | None -> false
-    | Some {target = _; source} ->
-        String.length source <= String.length path
-        && Stdlib.String.equal
-             source
-             (String.sub path ~pos:0 ~len:(String.length source))
+    | Some {target = _; source} -> String.is_prefix path ~prefix:source
   in
   match
     List.find

compiler/lib/code.ml

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
-open Stdlib
+open! Stdlib
 
 module Addr = struct
   type t = int
@@ -57,6 +57,8 @@ module Var : sig
 
   val print : Format.formatter -> t -> unit
 
+  val equal : t -> t -> bool
+
   val idx : t -> int
 
   val of_idx : int -> t
@@ -128,7 +130,9 @@ end = struct
   module T = struct
     type t = int
 
-    let compare v1 v2 = v1 - v2
+    let compare : t -> t -> int = compare
+
+    let equal (a : t) (b : t) = a = b
   end
 
   include T
@@ -564,9 +568,9 @@ let eq (pc1, blocks1, _) (pc2, blocks2, _) =
          &&
          try
            let block2 = Addr.Map.find pc blocks2 in
-           block1.params = block2.params
-           && block1.branch = block2.branch
-           && block1.body = block2.body
+           Poly.(block1.params = block2.params)
+           && Poly.(block1.branch = block2.branch)
+           && Poly.(block1.body = block2.body)
          with Not_found -> false)
        blocks1
        true
@@ -586,7 +590,7 @@ let invariant (_, blocks, _) =
     let define x =
       if check_defs
       then (
-        assert (defs.(Var.idx x) = false);
+        assert (not defs.(Var.idx x));
         defs.(Var.idx x) <- true)
     in
     let check_expr = function

compiler/lib/code.mli

@@ -50,6 +50,8 @@ module Var : sig
 
   val print : Format.formatter -> t -> unit
 
+  val equal : t -> t -> bool
+
   val idx : t -> int
 
   val of_idx : int -> t

compiler/lib/config.ml

@@ -17,7 +17,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *)
 
-open Stdlib
+open! Stdlib
 
 module Flag = struct
   let optims = ref []
@@ -137,7 +137,8 @@ module Param = struct
 
   let tc_default = TcTrampoline
 
-  let _tc_all = tc_default :: List.filter [TcNone; TcTrampoline] ~f:(( <> ) tc_default)
+  let _tc_all =
+    tc_default :: List.filter [TcNone; TcTrampoline] ~f:(Poly.( <> ) tc_default)
 
   let tailcall_optim =
     p

compiler/lib/constant.ml

@@ -16,6 +16,8 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 *)
 
+open! Stdlib
+
 let global_object = "joo_global_object"
 
 let extra_js_files = ["+graphics.js"; "+toplevel.js"; "+nat.js"; "+dynlink.js"]

compiler/lib/control.ml

@@ -21,7 +21,7 @@
 (*
 FIX: is there a way to merge this with dead code elimination?
 *)
-
+open! Stdlib
 open Code
 
 (****)

compiler/lib/deadcode.ml

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
-open Stdlib
+open! Stdlib
 
 let debug = Debug.find "deadcode"
 

compiler/lib/debug.ml

@@ -16,7 +16,7 @@
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
 
-open Stdlib
+open! Stdlib
 
 let series = ref None
 
@@ -55,7 +55,7 @@ let find s =
       state
   in
   fun () ->
-    if s = "times" then take_snapshot ();
+    if String.equal s "times" then take_snapshot ();
     (not !quiet) && !state
 
 let enable s =

compiler/lib/dgraph.ml

@@ -17,6 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
+open! Stdlib
 
 module Make (N : sig
   type t
@@ -187,7 +188,7 @@ struct
   let invert size g =
     let h = NTbl.make size [] in
     NSet.iter (fun x -> g.iter_children (fun y -> add_edge h y x) x) g.domain;
-    {domain = g.domain; iter_children = (fun f x -> List.iter f (successors h x))}
+    {domain = g.domain; iter_children = (fun f x -> List.iter ~f (successors h x))}
 
   module type DOMAIN = sig
     type t

compiler/lib/driver.ml

@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  *)
-open Stdlib
+open! Stdlib
 
 let debug = Debug.find "main"